Tweak 'skip update when the story URL would be changed' feature.

This commit is contained in:
Jim Miller
2013-04-28 11:34:46 -05:00
parent 91f5269453
commit 2566e434ee
+22 -18
View File
@@ -846,6 +846,28 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
book['icon'] = 'edit-redo.png'
book['status'] = 'Update'
if book_id and mi: # book_id and mi only set if matched by title/author.
liburl = self.get_story_url(db,book_id)
if book['url'] != liburl:
if collision in (OVERWRITE,OVERWRITEALWAYS):
updat="overwrit"
else:
updat="updat"
if not question_dialog(self.gui, 'Change Story URL?',
'<h3>Change Story URL?</h3>'+
'<p><b>%s</b> by <b>%s</b> is already in your library with a different source URL:</p>'%
(mi.title,', '.join(mi.author))+
'<p>In library: <a href="%(liburl)s">%(liburl)s</a></p><p>New URL: <a href="%(newurl)s">%(newurl)s</a></p>'%
{'liburl':liburl,'newurl':book['url']}+
"<p>Click '<b>Yes</b>' to %se book with new URL.</p>"%updat+
"<p>Click '<b>No</b>' to skip %sing this book.</p>"%updat,
show_copy_button=False):
book['comment'] = "Update declined by user due to differing story URL(%s)"%liburl
book['good']=False
book['icon']='rotate-right.png'
book['status'] = 'Different URL'
return
if book_id != None and collision != ADDNEW:
if collision in (CALIBREONLY):
book['comment'] = 'Metadata collected.'
@@ -891,24 +913,6 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
print("existing epub tmp:"+tmp.name)
book['epub_for_update'] = tmp.name
if book_id and mi: # book_id and mi only set if matched by title/author.
liburl = self.get_story_url(db,book_id)
if book['url'] != liburl:
if not question_dialog(self.gui, 'Change Story URL?',
'<h3>Change Story URL?</h3>'+
'<p><u>%s</u> by %s is already in your library with a different source URL:</p>'%
(mi.title,', '.join(mi.author))+
'<p>In library: <b>%s</b></p><p>New URL: <b>%s</b></p>'%
(liburl,book['url'])+
"<p>Click '<b>Yes</b>' to change book to new URL.</p>"+
"<p>Click '<b>No</b>' to skip updating this book.</p>",
show_copy_button=False):
book['comment'] = "Update declined by user due to differing story URL(%s)"%liburl
book['good']=False
book['icon']='rotate-right.png'
book['status'] = 'Different URL'
return
if book_id != None and prefs['injectseries']:
mi = db.get_metadata(book_id,index_is_id=True)
if not book['series'] and mi.series != None: