Properly process binary tags

fb2mobi.py

@@ -92,7 +92,10 @@ def rm_tmp_files(dest, deleteroot=True):
             os.rmdir(os.path.join(root, name))
 
     if deleteroot:
-        os.rmdir(dest)
+        try:
+            os.rmdir(dest)
+        except:
+            pass
 
 
 def process_file(config, infile, outfile=None):
@@ -564,6 +567,8 @@ def process(myargs):
         if myargs.transliterateauthorandtitle is not None:
             config.transliterate_author_and_title = myargs.transliterateauthorandtitle
 
+    config.log.info(' ')
+    config.log.info('**********************************************')
     config.log.info('Using configuration "{0}".'.format(config_file))
 
     if myargs.inputdir:

modules/fb2html.py

@@ -593,11 +593,11 @@ def parse_description(self, elem):
                         self.book_date = etree.tostring(t, method='text', encoding='utf-8').decode('utf-8').strip()
 
     def parse_binary(self, elem):
-        if elem.attrib['id'] and elem.attrib['content-type']:
-            have_file = False
+        if 'id' in elem.attrib:
             self.log.debug('Parsing binary {0}'.format(elem.attrib))
+            have_file = False
             elid = elem.attrib['id']
-            decl_type = elem.attrib['content-type'].lower()
+            decl_type = elem.attrib['content-type'].lower() if 'content-type' in elem.attrib else '---empty---'
             buff = base64.b64decode(elem.text.encode('ascii'))
             try:
                 img = Image.open(io.BytesIO(buff))

version.py

@@ -4,4 +4,4 @@
 
 WINDOWS = sys.platform == 'win32'
 
-VERSION = u'3.6.59'
+VERSION = u'3.6.60'