Improvements from the Pyhton 3 branch.

Author: Wintermute0110

resources/main.py

@@ -9850,6 +9850,7 @@ def _gui_edit_asset(self, object_kind, asset_ID, object_dic, categoryID = '', la
 
         # --- Link to a local image ---
         if mindex == 0:
+            log_debug('_gui_edit_asset() Linking local image...')
             image_dir = FileName(object_dic[AInfo.key]).getDir() if object_dic[AInfo.key] else ''
             log_debug('_gui_edit_asset() Initial path "{}"'.format(image_dir))
             if asset_ID == ASSET_MANUAL_ID or asset_ID == ASSET_TRAILER_ID:
@@ -9869,18 +9870,20 @@ def _gui_edit_asset(self, object_kind, asset_ID, object_dic, categoryID = '', la
             log_info('_gui_edit_asset() Linked {} {} "{}"'.format(object_name,
                 AInfo.name, image_file_path.getOriginalPath()))
 
-            # --- Update Kodi image cache ---
-            kodi_update_image_cache(image_file_path.getOriginalPath())
+            # Update Kodi image cache.
+            # TODO Only update mtime for local files and not for Kodi VFS files.
+            utils_update_file_mtime(image_file_path.getPath())
 
         # --- Import an image ---
         # Copy and rename a local image into asset directory.
         elif mindex == 1:
+            log_debug('_gui_edit_asset() Importing image...')
             # If assets exists start file dialog from current asset directory
             image_dir = ''
             if object_dic[AInfo.key]: image_dir = FileName(object_dic[AInfo.key]).getDir()
             log_debug('_gui_edit_asset() Initial path "{}"'.format(image_dir))
-            image_file = kodi_dialog_get_image('Select {} image'.format(AInfo.name),
-                AInfo.exts_dialog, image_dir)
+            t = 'Select {} image'.format(AInfo.name)
+            image_file = kodi_dialog_get_image(t, AInfo.exts_dialog, image_dir)
             image_FileName = FileName(image_file)
             if not image_FileName.exists(): return False
 
@@ -9915,16 +9918,19 @@ def _gui_edit_asset(self, object_kind, asset_ID, object_dic, categoryID = '', la
                 AInfo.name, dest_path_FileName.getOriginalPath()))
 
             # Update Kodi image cache.
-            kodi_update_image_cache(dest_path_FileName.getOriginalPath())
+            utils_update_file_mtime(dest_path_FileName.getPath())
 
         # --- Unset asset ---
         elif mindex == 2:
+            log_debug('_gui_edit_asset() Unsetting asset...')
             object_dic[AInfo.key] = ''
             kodi_notify('{} {} has been unset'.format(object_name, AInfo.name))
             log_info('_gui_edit_asset() Unset {} {}'.format(object_name, AInfo.name))
 
         # --- Manual scrape and choose from a list of images ---
         elif mindex >= 3:
+            log_debug('_gui_edit_asset() Scraping image...')
+
             # --- Create ScrapeFactory object ---
             scraper_index = mindex - len(common_menu_list)
             log_debug('_gui_edit_asset() Scraper index {}'.format(scraper_index))

resources/utils.py

@@ -519,6 +519,19 @@ def utils_look_for_file(rootPath, filename_noext, file_exts):
         if file_path.exists(): return file_path
     return None
 
+# Updates the mtime of a local file.
+# This is to force and update of the image cache.
+# stat.ST_MTIME is the time in seconds since the epoch.
+def utils_update_file_mtime(fname_str):
+    log_debug('utils_update_file_mtime() Updating "{}"'.format(fname_str))
+    filestat = os.stat(fname_str)
+    time_str = time.ctime(filestat.st_mtime)
+    log_debug('utils_update_file_mtime()     Old mtime "{}"'.format(time_str))
+    os.utime(fname_str)
+    filestat = os.stat(fname_str)
+    time_str = time.ctime(filestat.st_mtime)
+    log_debug('utils_update_file_mtime() Current mtime "{}"'.format(time_str))
+
 # -------------------------------------------------------------------------------------------------
 # Logging functions.
 # AEL never uses LOG_FATAL. Fatal error in my addons use LOG_ERROR. When an ERROR message is
@@ -1233,18 +1246,16 @@ def kodi_display_exception(ex):
 # image_path is a Unicode string.
 # cache_file_path is a Unicode string.
 def kodi_get_cached_image_FN(image_path):
-    THUMBS_CACHE_PATH = os.path.join(xbmc.translatePath('special://profile/' ), 'Thumbnails')
-
-    # --- Get the Kodi cached image ---
+    THUMBS_CACHE_PATH = os.path.join(xbmc.translatePath('special://profile/'), 'Thumbnails')
     # This function return the cache file base name
     base_name = xbmc.getCacheThumbName(image_path)
     cache_file_path = os.path.join(THUMBS_CACHE_PATH, base_name[0], base_name)
-
     return cache_file_path
 
+# *** Experimental code not used for releases ***
 # Updates Kodi image cache for the image provided in img_path.
 # In other words, copies the image img_path into Kodi cache entry.
-# Needles to say, only update image cache if image already was on the cache.
+# Needles to say, only update the image cache if the image already was on the cache.
 # img_path is a Unicode string
 def kodi_update_image_cache(img_path):
     # What if image is not cached?