Fixes scraping ROM metadata using CM. Github issue #146

Author: Wintermute0110

changelog.txt

@@ -156,10 +156,14 @@ FIX      Fix crash when reading a launcher NFO file when importing a launcher XM
          Refactored the NFO file functions a bit.
          See https://forum.kodi.tv/showthread.php?tid=287826&pid=3045045#pid3045045
 
+FIX  Error when scraping metadata.
+         See https://github.com/Wintermute0110/plugin.program.AEL/issues/146
+
 
 [B]Advanced Emulator Launcher | version 0.9.11 | xx xxxxxx 2021[/B]
 
 NOTE     This version is feature identical to 0.10.1
+         Main development is in the Pyhton 3 branch.
 
 
 [B]Advanced Emulator Launcher | version 0.10.0 | 22 June 2021[/B]

resources/main.py

@@ -2860,21 +2860,20 @@ def _command_edit_rom(self, categoryID, launcherID, romID):
                 scraper_index = mindex2 - len(common_menu_list)
                 scraper_ID = g_scrap_factory.get_metadata_scraper_ID_from_menu_idx(scraper_index)
 
-                # --- Grab data ---
-                object_dic = roms[romID]
-                ROM = FileName(roms[romID]['filename'])
+                # Prepare data for scraping.
+                rom = roms[romID]
+                ROM_FN = FileName(rom['filename'])
+                if rom['disks']:
+                    ROM_hash_FN = FileName(ROM_FN.getDir()).pjoin(rom['disks'][0])
+                else:
+                    ROM_hash_FN = ROM_FN
                 if categoryID == VCATEGORY_FAVOURITES_ID or categoryID == VCATEGORY_COLLECTIONS_ID:
-                    platform = roms[romID]['platform']
+                    platform = rom['platform']
                 else:
                     platform = self.launchers[launcherID]['platform']
-                if roms[romID]['disks']:
-                    # Multidisc ROM. Take first file of the set.
-                    ROM_checksums_FN = FileName(ROM.getDir()).pjoin(roms[romID]['disks'][0])
-                else:
-                    ROM_checksums_FN = ROM
                 data_dic = {
-                    'rom_FN' : ROM,
-                    'rom_checksums_FN' : ROM_checksums_FN,
+                    'ROM_FN' : ROM_FN,
+                    'ROM_hash_FN' : ROM_hash_FN,
                     'platform' : platform,
                 }
 
@@ -2886,7 +2885,7 @@ def _command_edit_rom(self, categoryID, launcherID, romID):
                 # Remember to flush caches after scraping.
                 st_dic = kodi_new_status_dic()
                 s_strategy = g_scrap_factory.create_CM_metadata(scraper_ID, platform)
-                s_strategy.scrap_CM_metadata_ROM(object_dic, data_dic, st_dic)
+                s_strategy.scrap_CM_metadata_ROM(rom, data_dic, st_dic)
                 g_scrap_factory.destroy_CM()
                 if kodi_display_status_message(st_dic): return
 
@@ -3000,9 +2999,7 @@ def _command_edit_rom(self, categoryID, launcherID, romID):
                     ROM_hash_FN = FileName(ROM_FN.getDir()).pjoin(rom['disks'][0])
                 else:
                     ROM_hash_FN = ROM_FN
-                if categoryID == VCATEGORY_FAVOURITES_ID:
-                    platform = rom['platform']
-                elif categoryID == VCATEGORY_COLLECTIONS_ID:
+                if categoryID == VCATEGORY_FAVOURITES_ID or categoryID == VCATEGORY_COLLECTIONS_ID:
                     platform = rom['platform']
                 else:
                     platform = self.launchers[launcherID]['platform']

resources/scrap.py

@@ -1074,8 +1074,7 @@ def _apply_candidate_on_metadata_new(self, gamedata, rom):
     def scrap_CM_metadata_ROM(self, object_dic, data_dic, st_dic):
         log_debug('ScrapeStrategy.scrap_CM_metadata_ROM() BEGIN ...')
         # In AEL 0.10.x this data is grabed from the objects, not passed using a dictionary.
-        rom_FN = data_dic['rom_FN']
-        rom_base_noext = rom_FN.getBaseNoExt()
+        rom_base_noext = data_dic['ROM_FN'].getBaseNoExt()
         scraper_name = self.scraper_obj.get_name()
 
         # --- Check if scraper is OK (API keys configured, etc.) ---
@@ -1222,14 +1221,14 @@ def scrap_CM_asset_all(self, object_dic, data_dic, st_dic):
     def _scrap_CM_get_candidate(self, object_name, object_dic, data_dic, st_dic):
         # log_debug('ScrapeStrategy._scrap_CM_get_candidate() BEGIN...')
 
-        # In AEL 0.10.x this data is grabed from the objects, not passed using a dictionary.
+        # In AEL 0.10.x this data is grabbed from the objects, not passed using a dictionary.
         ROM_FN = data_dic['ROM_FN']
         ROM_hash_FN = data_dic['ROM_hash_FN']
         platform = data_dic['platform']
         scraper_name = self.scraper_obj.get_name()
 
         # * Note that empty candidates may be in the cache. An empty candidate means that
-        #   the scraper search was unsucessful. For some scrapers, changing the search
+        #   the scraper search was unsuccessful. For some scrapers, changing the search
         #   string may produce a valid candidate.
         # * In the context menu always rescrape empty candidates.
         # * In the ROM scanner empty candidates are never rescraped. In that cases
@@ -1458,7 +1457,7 @@ class Scraper(object):
     # the number of API calls is exceeded).
     EXCEPTION_COUNTER_THRESHOLD = 5
 
-    # Disk cache types. These string will be part of the cache file names.
+    # Disk cache types. These strings will be part of the cache JSON file names.
     CACHE_CANDIDATES = 'candidates'
     CACHE_METADATA   = 'metadata'
     CACHE_ASSETS     = 'assets'