Sync code with master branch.

Master branch is now the Python 3 Matrix branch. Also "Fixes scraping ROM metadata using CM. Github issue #146"

Author: Wintermute0110

addon.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.program.advanced.emulator.launcher" name="Advanced Emulator Launcher" version="0.9.11-alpha" provider-name="Wintermute0110">
+<addon
+    id="plugin.program.advanced.emulator.launcher"
+    name="Advanced Emulator Launcher"
+    version="0.9.11-alpha"
+    provider-name="Wintermute0110">
     <requires>
         <!--
             Check main addon versions in https://github.com/xbmc/xbmc/tree/master/addons

changelog.txt

@@ -150,16 +150,20 @@ WIP FIX  Fix launching of ROMs with Windows network filenames.
          See https://forum.kodi.tv/showthread.php?tid=287826&pid=2919639#pid2919639
 
 
-[B]Advanced Emulator Launcher | version 0.10.1 | xx xxxxxx 2021[/B]
+[B]Advanced Emulator Launcher | version 0.10.1 | 04 August 2021[/B]
 
 FIX      Fix crash when reading a launcher NFO file when importing a launcher XML file.
          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
+[B]Advanced Emulator Launcher | version 0.9.11 | 04 August 2021[/B]
+
+NOTE     This version is for Python 2 and feature identical to 0.10.1
+         Main development is in the Python 3 branch.
 
 
 [B]Advanced Emulator Launcher | version 0.10.0 | 22 June 2021[/B]
@@ -175,7 +179,7 @@ FEATURE  Port release 0.9.10 to Python 3.
 
 [B]Advanced Emulator Launcher | version 0.9.10 | 22 June 2021[/B]
 
-NOTE     Python 2 version for Leia/Krypon in branch release-0.9.x-python2
+NOTE     Python 2 version for Leia/Krypton in branch release-0.9.x-python2
          Have a look at AML code to ease the conversion.
 
 FEATURE  Create file misc.py and refactor utils.py. Copy structure from AML.

resources/main.py

@@ -2864,21 +2864,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,
                 }
 
@@ -2890,7 +2889,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
 
@@ -3004,9 +3003,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']