sam/AutomatedFanfic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fictionpress regex, updated error message when can't find file in library. If website does not have a regex, then likely can't find previous copies in the calibredb search.

Browse Source
This commit is contained in:
Joshua Gang 2018-06-20 16:42:09 -04:00
parent 04ab385457
commit db8d9e953b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fanficdownload.py
View File

@ -74,6 +74,7 @@ def touch(fname, times=None):
ffnet = re.compile('(fanfiction.net/s/\d*)/?.*') ffnet = re.compile('(fanfiction.net/s/\d*)/?.*')
aooo = re.compile('(archiveofourown.org/works/\d*)/?.*') aooo = re.compile('(archiveofourown.org/works/\d*)/?.*')
ficpress = re.compile('(fictionpress.com/s/\d*)/?.*')
neutral = re.compile('https?://(.*)') neutral = re.compile('https?://(.*)')
story_name = re.compile('(.*)-.*') story_name = re.compile('(.*)-.*')
@ -92,6 +93,8 @@ def parse_url(url):
url = "www." + ffnet.search(url).group(1) url = "www." + ffnet.search(url).group(1)
elif aooo.search(url): elif aooo.search(url):
url = aooo.search(url).group(1) url = aooo.search(url).group(1)
elif ficpress.search(url):
url = ficpress.search(url).group(1)
elif neutral.search(url): elif neutral.search(url):
url = neutral.search(url).group(1) url = neutral.search(url).group(1)
return url return url
@ -208,7 +211,7 @@ def downloader(args):
"It's been added to library, but not sure what the ID is.", "It's been added to library, but not sure what the ID is.",
'WARNING', 'WARNING',
live) live)
output += log("Added file to library with id 0", 'GREEN', live) output += log("Added /Story-file to library with id 0", 'GREEN', live)
remove(cur) remove(cur)
else: else:
res = check_output( res = check_output(