Commit Graph

62 Commits

Author SHA1 Message Date
Dan
8ad40e74ba Merged dev and switched server to waitress for production 2020-08-07 02:36:26 -04:00
Dan
f6387a2b7e tweak 2020-08-07 02:34:55 -04:00
Dan
5a319c8eb6 swapped server back to dev server on this branch. Added more json parsing to the downloadReturn function. 2020-08-07 01:45:58 -04:00
Dan
f539f00752 Merge branch 'Dev' into Docker 2020-08-07 00:44:43 -04:00
Dan
be4f85c089 Corrected json array value 2020-08-07 00:44:28 -04:00
Dan
38650cceb3 Merge branch 'Dev' into Docker
Made progress with parsing json and pretty printing to html divs. Pushing to production to further test the downlod side.
2020-08-07 00:20:43 -04:00
Dan
bec0c2dc67 parsing json response and pretty printing into the main body now. Each manga is getting it's own div so it can be semi-easily expanding with additional information in the future. Main screen is also cleared as part of the onClick now so it helps it be more readable. Active is tested and working, couldn't test download fully. 2020-08-07 00:18:07 -04:00
Dan
82c8cc8430 Merge branch 'Dev' into Docker
Adding website features to the system
2020-07-30 02:53:52 -04:00
Dan
af4c2dc08d More work on setting up the webpage. There's now an active and download button. The reponse should populate the main section of the page in a scrolling overflow box. Although it's a long string instead of a nicely parsed json file at this point. 2020-07-30 02:51:01 -04:00
Dan
a728d630a0 added static to dockerfile. Started setting up css grid, with nav on left and large main window 2020-07-30 00:54:54 -04:00
Dan
59cbbca5cc Docker version switched back to waitress 2020-07-29 21:01:13 -04:00
Dan
422b2a111c got buttons working on index. Starting working on css and page layout. Temporarily swithed back to dev server instead of waitress 2020-07-29 20:42:42 -04:00
2aeb04b6f6 stream read seemed to break things. Commented it out. 2020-06-19 10:44:21 -04:00
d59c4d1755 Fix paths 2020-06-16 13:44:19 -04:00
57b562fc81 more work on output parsing 2020-05-23 23:24:23 -04:00
b23a045cee more work on output parsing 2020-05-23 23:08:06 -04:00
60748b8e15 started working on getting output so it can be parsed and used for logic. 2020-05-23 22:21:26 -04:00
e38d76fbd7 Merge remote-tracking branch 'origin/Docker' into Docker 2020-05-23 21:32:53 -04:00
f8acfbb751 added variable for file name. Also updated requirements to latest versions. 2020-05-23 21:30:36 -04:00
7acc7871f3 added variable for file name. Also updated requirements to latest versions. 2020-05-23 00:23:00 -04:00
29b374c57f Merge branch 'Docker' into Dev
# Conflicts:
#	main.py
2020-05-22 23:54:19 -04:00
c9e9a1c321 Clean up 2020-05-22 23:46:54 -04:00
553ca5204a ood method should update the row instead of just adding a new row now. It also has some logic to return a list of new, unadded manga when updating urls 2020-05-22 23:43:17 -04:00
1a6e9b4417 ood method should update the row instead of just adding a new row now 2020-05-22 23:39:08 -04:00
cf80116185 Worked on the out of date method a bit. All the checking logic is in place. But it adds a new record instead of updating the existing record. 2020-05-22 23:13:30 -04:00
f071a67e77 I don't think it accomplished what I was planning on doing. But it's being served with waitress now. 2020-04-17 00:36:23 -04:00
f04220fc03 Little clean up. Updated requirements.txt and turned off the flask run thing in preperation to try running under waitress. 2020-04-17 00:31:59 -04:00
6bd4addc9c Added method to manually add a manga without uploading a new json file. Just need to pass a "name" and "url" node. URL must include http or https. 2020-04-16 21:40:50 -04:00
9e46ed7d33 Added method to upgrade manga-py without updating entire container. Started working on method to check if the manga url matches what is in the json file. Will add option to update db urls if they differ. 2020-04-01 13:12:01 -04:00
4118686ec1 Made a change to the subprocess call to hopefully stop the json error until I can figure that out. Also added the templates directory to the Dockerfile 2020-03-27 00:25:25 -04:00
8a0b81f6a6 subprocess args should be working correctly now. 2020-03-24 15:58:08 -04:00
9d73de8d04 Merge branch 'Docker' of https://bitbucket.org/DanDembinski/mangadownloader into Docker 2020-03-24 12:48:34 -04:00
Dan Dembinski
36eef06f3e Adjusted subprocess calls 2020-03-20 11:51:53 -04:00
Dan Dembinski
23a8bc0d42 Adjusted subprocess calls 2020-03-20 11:01:02 -04:00
Dan Dembinski
e1b4be2d40 attempting to capture manga-py output in response. 2020-03-20 10:13:01 -04:00
Dan Dembinski
db1b5e4af2 print-json argument added. 2020-03-17 14:44:50 -04:00
Dan Dembinski
2b4c244c1f Started setting up very simple front end for cicking off download process. Also added a new method to check if there is any missing url metadata and what mangas it effects. 2020-03-17 13:19:26 -04:00
cd33c1b8dd Merge branch 'Docker' of https://bitbucket.org/DanDembinski/mangadownloader into Docker 2020-03-17 11:15:58 -04:00
Dan Dembinski
9c3a2b6aa2 stripping '?'s out of folder path now. 2020-03-13 15:09:12 -04:00
Dan Dembinski
4eb8d9b76e Cleaned up. Added some logic incase the base url is in the URL instead of being tied to the URL_flag. Added method to check what mangas are active. 2020-03-13 14:31:29 -04:00
0654235eb5 Got the upload working. 2020-03-11 23:27:51 -04:00
f2a3bd075b Tweaks 2020-03-11 22:41:51 -04:00
469e2457a3 Tweaks 2020-03-11 22:29:09 -04:00
Dan Dembinski
3d67df0f7d Converted upload method to ORM and added route. 2020-03-11 16:50:52 -04:00
Dan Dembinski
2db2898d2f Added active filter to download method query. 2020-03-11 16:14:12 -04:00
Dan Dembinski
0568f7af9d Turned on downloading. 2020-03-11 14:56:34 -04:00
Dan Dembinski
b609c1b587 Updated Docker file to work. 2020-03-11 14:55:04 -04:00
Dan Dembinski
c0003ec6d7 Updated Docker file to work. 2020-03-11 14:46:16 -04:00
Dan Dembinski
4581fce3b4 Reworked download method use ORM instead of straight SQL. Hoping this fixes the database timeout issue. Also added requirements.txt with all the python packages needed 2020-03-11 14:34:49 -04:00
abb101a8a7 Alright, you do in fact need to have the docker file actually start something.
I also swapped the exit command out for a sleep command. It should loop through everything once an hour
2019-12-31 15:21:48 -05:00