Commit Graph

203 Commits

Author SHA1 Message Date
2ecc0ab680 Fix after rebase 2021-05-01 16:30:22 -05:00
a701437548 bring parser inline with json_import branch 2021-05-01 16:30:22 -05:00
25f6adba1f unescape html document 2021-05-01 16:30:22 -05:00
018fa0a62f updated bookmarklet to work with updated import process 2021-05-01 16:30:22 -05:00
faf458e8ef Squashed commit of the following:
commit 707d862e01a7497a1f22879d314b865a35e0e85b
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 10:35:00 2021 -0500

    works now

commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 10:25:24 2021 -0500

    updated serializer and api

commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 10:20:19 2021 -0500

    fixed bookmarklet

commit 9779104902d3be0258c95cd2eeebcba0d5d48892
Merge: bb8262c 0cb3928
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 09:56:27 2021 -0500

    Merge branch 'bookmarklet' into json_import

commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 09:42:53 2021 -0500

    retrieve bookmarklet ID from get

commit e89e0218de684d40b2e2bfb6ba833891206c828e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 09:29:33 2021 -0500

    Revert "fixed broken tab"

    This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6.

commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79
Merge: b1e73aa 35a7f62
Author: smilerz <smilerz@gmail.com>
Date:   Sun Apr 11 20:35:57 2021 -0500

    Merge branch 'main_fork' into json_import
2021-05-01 16:30:22 -05:00
2b16f966a2 Revert "bug fix url import"
This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23.
2021-05-01 16:30:22 -05:00
c2931137bb removed extra string normalization 2021-05-01 16:30:22 -05:00
11fa23f3da fixes #527 2021-05-01 16:30:22 -05:00
6de128757f bug fix url import 2021-05-01 16:30:22 -05:00
7c682ebab3 url import bug fixes 2021-05-01 16:30:22 -05:00
4bc4ce0d7c bug fix url import 2021-05-01 16:30:22 -05:00
5fff5b97da simplified url import 2021-05-01 16:30:21 -05:00
e4044016c3 added all ATK sites to custom scraper 2021-05-01 16:30:21 -05:00
52df886372 added cooksillustrated custom scraper 2021-05-01 16:30:21 -05:00
c7949edb18 ensure time is always a number 2021-05-01 16:30:21 -05:00
342a261017 added ability to create custom scrapers 2021-05-01 16:30:21 -05:00
e5984abd97 removed old json importer 2021-05-01 16:30:21 -05:00
2ea3e4f8f3 updated import from source to use text scraper 2021-05-01 16:30:21 -05:00
98b3b002f9 remove old html_import function 2021-05-01 16:30:21 -05:00
d2a1a0ac32 wrapper for recipe_scrapers to parse text input 2021-05-01 16:30:21 -05:00
7cc757ac33 redirect to import url for processing 2021-05-01 16:30:21 -05:00
7fb440a855 bookmarklet passing data to form 2021-05-01 16:30:21 -05:00
4aaecb4ada updated links to import recipes 2021-05-01 16:30:21 -05:00
154527ef1b cosmetic cleanup 2021-05-01 16:30:21 -05:00
788e253749 added image import 2021-05-01 16:30:21 -05:00
9cc6a1dc79 combined json import and source import 2021-05-01 16:30:20 -05:00
6a13619bbd more fix from super ugly merge 2021-05-01 16:30:20 -05:00
58e33ef31a more cleanup from ugly merge 2021-05-01 16:30:20 -05:00
36841d74af fixed ugly merge 2021-05-01 16:30:20 -05:00
71e02c0916 manually parse json 2021-05-01 16:30:20 -05:00
34ff484830 commit merge from Patralos/recipes 2021-05-01 16:30:20 -05:00
55ba568f3c import raw json/html 2021-05-01 16:30:20 -05:00
8f3f1c230c refactored json parser to create functions for each sub parser 2021-05-01 16:30:20 -05:00
1690abaf47 replace common fractions with their concrete value (else parsing is not possible) 2021-05-01 16:30:20 -05:00
d1b9d15816 recipe_scrapers deprectation fix 2021-05-01 22:56:00 +02:00
3daebc4170 Merge branch 'develop' into json_import 2021-05-01 22:39:20 +02:00
aafbc497cc search view fixes/updates 2021-05-01 22:16:29 +02:00
be84e44e43 recipe view enhancements 2021-04-28 11:27:20 +02:00
dc27f39393 added recently viewed to new search 2021-04-26 17:21:14 +02:00
0f4cd4b17c fix ATK scraper 2021-04-19 14:37:26 -05:00
ae3835b541 update ATK scraper 2021-04-19 14:31:48 -05:00
a376c3a5b6 meal plan random fix 2021-04-18 17:55:48 +02:00
4ad5d6ef2f fixed test + added api doc for new search 2021-04-18 15:01:39 +02:00
e676b4bac3 added api pagination for recipes 2021-04-18 14:05:19 +02:00
f78f7dfc14 search ui improvements and filter 2021-04-18 02:55:50 +02:00
7930c2417c update ATK scrape to handle empty headnote 2021-04-17 17:12:43 -05:00
880db58d38 v2 search filtering 2021-04-17 21:28:29 +02:00
2f27413c0a parse multiple ingredientGroups
previous version assumed only a single item in a list - this loops through each item
2021-04-17 14:12:24 -05:00
5869a8ad1b fixes to pass tests 2021-04-17 13:43:34 -05:00
d449fc8fd8 updated normalization to skip removing line breaks 2021-04-17 12:49:42 -05:00