Merge 413182b97b into 3373d93874

Obok_plugin/action.py

@@ -374,7 +374,11 @@ class InterfacePluginAction(InterfaceAction):
         result['success'] = False
         result['fileobj'] = None
 
+        try:
             zin = zipfile.ZipFile(book.filename, 'r')
+        except FileNotFoundError:
+            print (_('{0} - File "{1}" not found. Make sure the eBook has been properly downloaded in the Kobo app.').format(PLUGIN_NAME, book.filename))
+            return result
         #print ('Kobo library filename: {0}'.format(book.filename))
         for userkey in self.userkeys:
             print (_('Trying key: '), codecs.encode(userkey, 'hex'))

Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_fileopen.pyw

@@ -146,6 +146,7 @@ import inspect
 import tempfile
 import sqlite3
 import httplib
+import binascii
 
 from decimal import Decimal
 import itertools