Merge pull request #112 from wackerl91/feature/LUNA-58

LUNA-58: Can't access game list in 0.7-rc1
wackerl91 · Dec 15, 2016 · 3160be3 · 3160be3
2 parents b0f3795 + cca9390
commit 3160be3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
@@ -26,7 +26,6 @@
     <string id="30021">Scraper</string>
     <string id="30022">Clear Game Cache</string>
     <string id="30023">Override Default Resolution</string>
-    <string id="30024">Disable Experimental Scraper Feature</string>
     <string id="30025">Enable OMDB as Game Information Provider</string>
     <string id="30026">Enable TheGamesDB as Game Information Provider</string>
     <string id="30027">Enable IGDB as Game Information Provider</string>

diff --git a/resources/lib/di/requiredfeature.py b/resources/lib/di/requiredfeature.py
@@ -82,7 +82,7 @@ def request(self):
                 tagged_features = featurebroker.features.get_tagged_features(self.feature)
                 if featurebroker.has_methods('append')(instance):
                     for key, tagged_feature in enumerate(tagged_features):
-                        tagged_features[key] = RequiredFeature(tagged_feature).request()
+                        tagged_features[key] = RequiredFeature(tagged_feature.name).request()
 
                     instance.append(tagged_features)
             except KeyError:

diff --git a/resources/lib/scraper/scraperchain.py b/resources/lib/scraper/scraperchain.py
@@ -70,6 +70,7 @@ def append(self, scrapers):
 
     def _append_scraper(self, scraper):
         if isinstance(scraper, AbstractScraper):
+            self.logger.info("Appending Scraper: %s" % scraper.name())
             self.scraper_chain.append(scraper)
         else:
             raise AssertionError('Expected to receive an instance of AbstractScraper, got %s instead' % type(scraper))
diff --git a/resources/settings.xml b/resources/settings.xml
@@ -29,7 +29,6 @@
         <setting label="30038" type="bool" id="enable_moonlight_debug" default="false"/>
     </category>
     <category label="30021">
-        <setting label="30024" type="bool" id="disable_scraper" default="false"/>
         <setting label="30025" enable="eq(-1,false)" type="bool" id="enable_omdb" default="true"/>
         <setting label="30026" enable="eq(-2,false)" type="bool" id="enable_tgdb" default="true"/>
         <setting label="30027" enable="eq(-3,false)" type="bool" id="enable_igdb" default="false"/>