Cosmetic changes from AML.

Author: Wintermute0110

resources/constants.py

@@ -53,6 +53,9 @@
 JSON_INDENT = 1
 JSON_SEP = (', ', ': ')
 
+# -------------------------------------------------------------------------------------------------
+# CUSTOM/DEBUG/TEST settings
+# -------------------------------------------------------------------------------------------------
 # An integer number incremented whenever there is a change in the ROM storage format.
 # This enables easy migrations, at least in theory.
 AEL_STORAGE_FORMAT = 1
@@ -68,6 +71,58 @@
 KC_BLUEVIOLET = '[COLOR blueviolet]'
 KC_END        = '[/COLOR]'
 
+# -------------------------------------------------------------------------------------------------
+# Image file constants.
+# -------------------------------------------------------------------------------------------------
+# Supported image files in:
+# 1. misc_identify_image_id_by_contents()
+# 2. misc_identify_image_id_by_ext()
+IMAGE_PNG_ID     = 'PNG'
+IMAGE_JPEG_ID    = 'JPEG'
+IMAGE_GIF_ID     = 'GIF'
+IMAGE_BMP_ID     = 'BMP'
+IMAGE_TIFF_ID    = 'TIFF'
+IMAGE_UKNOWN_ID  = 'Image unknown'
+IMAGE_CORRUPT_ID = 'Image corrupt'
+
+IMAGE_IDS = [
+    IMAGE_PNG_ID,
+    IMAGE_JPEG_ID,
+    IMAGE_GIF_ID,
+    IMAGE_BMP_ID,
+    IMAGE_TIFF_ID,
+]
+
+IMAGE_EXTENSIONS = {
+    IMAGE_PNG_ID  : ['png'],
+    IMAGE_JPEG_ID : ['jpg', 'jpeg'],
+    IMAGE_GIF_ID  : ['gif'],
+    IMAGE_BMP_ID  : ['bmp'],
+    IMAGE_TIFF_ID : ['tif', 'tiff'],
+}
+
+# Image file magic numbers. All at file offset 0.
+# See https://en.wikipedia.org/wiki/List_of_file_signatures
+# b prefix is a byte string in both Python 2 and 3.
+IMAGE_MAGIC_DIC = {
+    IMAGE_PNG_ID  : [ b'\x89\x50\x4E\x47\x0D\x0A\x1A\x0A' ],
+    IMAGE_JPEG_ID : [
+        b'\xFF\xD8\xFF\xDB',
+        b'\xFF\xD8\xFF\xE0\x00\x10\x4A\x46\x49\x46\x00\x01',
+        b'\xFF\xD8\xFF\xEE',
+        b'\xFF\xD8\xFF\xE1',
+    ],
+    IMAGE_GIF_ID  : [
+        b'\x47\x49\x46\x38\x37\x61',
+        b'\x47\x49\x46\x38\x39\x61',
+    ],
+    IMAGE_BMP_ID  : [ b'\x42\x4D' ],
+    IMAGE_TIFF_ID : [
+        b'\x49\x49\x2A\x00',
+        b'\x4D\x4D\x00\x2A',
+    ]
+}
+
 # -------------------------------------------------------------------------------------------------
 # Addon constants
 # -------------------------------------------------------------------------------------------------
@@ -336,33 +391,6 @@
     ASSET_TRAILER_ID,
 ]
 
-# Supported image files in:
-# 1. misc_identify_image_id_by_contents()
-# 2. misc_identify_image_id_by_ext()
-IMAGE_PNG_ID     = 'PNG'
-IMAGE_JPEG_ID    = 'JPEG'
-IMAGE_GIF_ID     = 'GIF'
-IMAGE_BMP_ID     = 'BMP'
-IMAGE_TIFF_ID    = 'TIFF'
-IMAGE_UKNOWN_ID  = 'Image unknown'
-IMAGE_CORRUPT_ID = 'Image corrupt'
-
-IMAGE_IDS = [
-    IMAGE_PNG_ID,
-    IMAGE_JPEG_ID,
-    IMAGE_GIF_ID,
-    IMAGE_BMP_ID,
-    IMAGE_TIFF_ID,
-]
-
-IMAGE_EXTENSIONS = {
-    IMAGE_PNG_ID  : ['png'],
-    IMAGE_JPEG_ID : ['jpg', 'jpeg'],
-    IMAGE_GIF_ID  : ['gif'],
-    IMAGE_BMP_ID  : ['bmp'],
-    IMAGE_TIFF_ID : ['tif', 'tiff'],
-}
-
 # --- Addon will search these file extensions for assets ---
 # Check http://kodi.wiki/view/advancedsettings.xml#videoextensions
 IMAGE_EXTENSION_LIST   = ['png', 'jpg', 'jpeg', 'gif', 'bmp', 'tif', 'tiff']

resources/misc.py

@@ -688,28 +688,6 @@ def misc_replace_fav(dict_in, old_item_key, new_item_key, new_value):
     else:
         raise TypeError
 
-# Image file magic numbers. All at file offset 0.
-# See https://en.wikipedia.org/wiki/List_of_file_signatures
-# b prefix is a byte string in both Pyhton 2 and 3.
-IMAGE_MAGIC_DIC = {
-    IMAGE_PNG_ID  : [ b'\x89\x50\x4E\x47\x0D\x0A\x1A\x0A' ],
-    IMAGE_JPEG_ID : [
-        b'\xFF\xD8\xFF\xDB',
-        b'\xFF\xD8\xFF\xE0\x00\x10\x4A\x46\x49\x46\x00\x01',
-        b'\xFF\xD8\xFF\xEE',
-        b'\xFF\xD8\xFF\xE1',
-    ],
-    IMAGE_GIF_ID  : [
-        b'\x47\x49\x46\x38\x37\x61',
-        b'\x47\x49\x46\x38\x39\x61',
-    ],
-    IMAGE_BMP_ID  : [ b'\x42\x4D' ],
-    IMAGE_TIFF_ID : [
-        b'\x49\x49\x2A\x00',
-        b'\x4D\x4D\x00\x2A',
-    ]
-}
-
 # Inspects an image file and determine its type by using the magic numbers,
 # Returns an image id defined in list IMAGE_IDS or IMAGE_UKNOWN_ID.
 def misc_identify_image_id_by_contents(asset_fname):

resources/utils.py

@@ -64,7 +64,7 @@
 import sys
 import threading
 import time
-import xml
+import xml.etree.ElementTree
 import zlib
 
 # --- Determine interpreter running platform ---
@@ -331,15 +331,12 @@ def utils_load_XML_to_ET(filename):
         # log_debug(text_type(ex.errno.errorcode))
         # No such file or directory
         if ex.errno == errno.ENOENT:
-            log_error('utils_load_XML_to_ET() (IOError) No such file or directory.')
+            log_error('utils_load_XML_to_ET() (IOError) ENOENT No such file or directory.')
         else:
             log_error('utils_load_XML_to_ET() (IOError) Unhandled errno value.')
     except xml.etree.ElementTree.ParseError as ex:
-        log_error('utils_load_XML_to_ET() (ParseError) Exception parsing XML categories.xml')
+        log_error('utils_load_XML_to_ET() (ParseError) Exception parsing {}'.format(filename))
         log_error('utils_load_XML_to_ET() (ParseError) {}'.format(text_type(ex)))
-        # kodi_dialog_OK('(ET.ParseError) when reading categories.xml. '
-        #     'XML file is corrupt or contains invalid characters.')
-
     return xml_tree
 
 # -------------------------------------------------------------------------------------------------
@@ -350,15 +347,15 @@ def utils_load_JSON_file(json_filename, default_obj = {}, verbose = True):
     # If file does not exist return default object (usually empty object)
     json_data = default_obj
     if not os.path.isfile(json_filename):
-        log_warning('utils_load_JSON_file_dic() Not found "{}"'.format(json_filename))
+        log_warning('utils_load_JSON_file() Not found "{}"'.format(json_filename))
         return json_data
     # Load and parse JSON file.
-    if verbose: log_debug('utils_load_JSON_file_dic() "{}"'.format(json_filename))
+    if verbose: log_debug('utils_load_JSON_file() "{}"'.format(json_filename))
     with io.open(json_filename, 'rt', encoding = 'utf-8') as file:
         try:
             json_data = json.load(file)
         except ValueError as ex:
-            log_error('utils_load_JSON_file_dic() ValueError exception in json.load() function')
+            log_error('utils_load_JSON_file() ValueError exception in json.load() function')
 
     return json_data
 
@@ -432,7 +429,7 @@ def __init__(self, json_filename):
         self.json_filename = json_filename
 
     def run(self):
-        self.output_dic = utils_load_JSON_file_dic(self.json_filename)
+        self.output_dic = utils_load_JSON_file(self.json_filename)
 
 # -------------------------------------------------------------------------------------------------
 # File cache functions.