use xbmcvfs to read description files

maloep · Jan 6, 2018 · 610d69e · 610d69e
1 parent 7252beb
commit 610d69e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/resources/lib/pyscraper/descriptionparser.py b/resources/lib/pyscraper/descriptionparser.py
@@ -1,4 +1,5 @@
 
+import xbmcvfs
 import time
 import urllib2
 from util import Logutil as log
@@ -18,8 +19,8 @@ def downloadDescription(self, descriptionUrl):
 
 	def openFile(self, descriptionFilepath):
 		try:
-			with open(str(descriptionFilepath), 'r') as fh:
-				return fh.read()
+			fh = xbmcvfs.File(str(descriptionFilepath))
+			return fh.read()
 		except Exception as e:
 			log.error("Unable to open metadata from {0}: {1}".format(descriptionFilepath, e))
 

diff --git a/resources/lib/pyscraper/pyscraper.py b/resources/lib/pyscraper/pyscraper.py
@@ -240,10 +240,10 @@ def prepareScraperSource(self, scraper, scraperSourceOrig, romFilename):
 		for i in range(0, len(replaceTokens)):
 			scraperSource = scraperSource.replace(replaceTokens[i], replaceValues[i])
 
-		if not scraperSource.startswith('http') and not os.path.exists(scraperSource):
+		if not scraperSource.startswith('http') and not xbmcvfs.exists(scraperSource):
 			# try again with original rom filename
 			scraperSource = scraperSourceOrig.replace("%GAME%", romFilename)
-			if not os.path.exists(scraperSource):
+			if not xbmcvfs.exists(scraperSource):
 				log.warn("description file for game {0} could not be found. Check if this path exists: {1}".format(gamenameFromFile, scraperSource))
 				return ""