Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2025-12-25 02:03:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix for problem with new collision code and rejected URL.

Browse source
This commit is contained in:
Jim Miller 2018-10-18 13:27:27 -05:00
parent 3c4e91c11d
commit f86d7d39b8
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
calibre-plugin/fff_plugin.py
View file

@ -1080,13 +1080,6 @@ class FanFicFarePlugin(InterfaceAction):
logger.debug("url:%s"%url)
mi = None
## Check reject list. Redundant with below for when story URL
## changes, but also kept here to avoid network hit in most
## common case where given url is story url.
if self.reject_url(merge,book):
return
# The current database shown in the GUI
# db is an instance of the class LibraryDatabase2 from database.py
# This class has many, many methods that allow you to do a lot of
@ -1099,6 +1092,12 @@ class FanFicFarePlugin(InterfaceAction):
bgmeta= options['bgmeta']
updateepubcover= options['updateepubcover']
## Check reject list. Redundant with below for when story URL
## changes, but also kept here to avoid network hit in most
## common case where given url is story url.
if self.reject_url(merge,book):
return
# Dialogs should prevent this case now.
if collision in (UPDATE,UPDATEALWAYS) and fileform != 'epub':
raise NotGoingToDownload(_("Cannot update non-epub format."))