Fix for collision issue with translations and email direct d/l.

JimmXinu · Jun 4, 2020 · 54409dd · 54409dd
1 parent 37bc54f
commit 54409dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/calibre-plugin/fff_plugin.py b/calibre-plugin/fff_plugin.py
@@ -104,7 +104,7 @@
     LoopProgressDialog, UserPassDialog, AboutDialog, CollectURLDialog,
     RejectListDialog, EmailPassDialog,
     OVERWRITE, OVERWRITEALWAYS, UPDATE, UPDATEALWAYS, ADDNEW, SKIP, CALIBREONLY,
-    CALIBREONLYSAVECOL,
+    CALIBREONLYSAVECOL, save_collisions,
     NotGoingToDownload, RejectUrlEntry )
 
 # because calibre immediately transforms html into zip and don't want
@@ -515,7 +515,8 @@ def get_urls_from_imap_menu(self):
             if url_list:
                 self.prep_downloads({
                         'fileform': prefs['fileform'],
-                        'collision': prefs['collision'],
+                        # save_collisions==convert from save value to local lang value
+                        'collision': save_collisions[prefs['collision']],
                         'updatemeta': prefs['updatemeta'],
                         'bgmeta': False,
                         'updateepubcover': prefs['updateepubcover'],

diff --git a/calibre-plugin/jobs.py b/calibre-plugin/jobs.py
@@ -302,6 +302,10 @@ def do_download_for_worker(book,options,merge,notification=lambda x,y:x):
                 book['all_metadata'] = story.getAllMetadata(removeallentities=True)
                 if options['savemetacol'] != '':
                     book['savemetacol'] = story.dump_html_metadata()
+            else:
+                ## Shouldn't ever get here, but hey, it happened once
+                ## before with prefs['collision']
+                raise Exception("Impossible state reached -- Book: %s:\nOptions:%s:"%(book,options))
 
             if options['do_wordcount'] == SAVE_YES or (
                 options['do_wordcount'] == SAVE_YES_UNLESS_SITE and not story.getMetadataRaw('numWords') ):