cleanup

Author: jbleyel

plugin/process.py

@@ -103,7 +103,7 @@ def _process_path(self, subfile, current_encoding=None):
         size = getFileSize(subfile)
         if size and size > SUBTITLES_FILE_MAX_SIZE:
             self.log.error("<%s> not supported subtitles size ({%d}KB > {%d}KB)!", filename, size // 1024, SUBTITLES_FILE_MAX_SIZE // 1024)
-            raise LoadError('"%s" - not supported subtitles size: "%dKB"' % (toString(os.path.basename(subfile)), size // 1024))
+            raise LoadError('"%s" - not supported subtitles size: "%dKB"' % (os.path.basename(subfile), size // 1024))
         try:
             text = load(subfile)
         except (URLError, HTTPError, IOError) as e:

plugin/seek.py

@@ -99,8 +99,8 @@ class SubsSeeker(object):
 
     def __init__(self, download_path, tmp_path, captcha_cb, delay_cb, message_cb, settings=None, settings_provider_cls=None, settings_provider_args=None, debug=False, providers=None):
         self.log = SimpleLogger(self.__class__.__name__, log_level=debug and SimpleLogger.LOG_DEBUG or SimpleLogger.LOG_INFO)
-        self.download_path = toString(download_path)
-        self.tmp_path = toString(tmp_path)
+        self.download_path = download_path
+        self.tmp_path = tmp_path
         self.seekers = []
         providers = providers or SUBTITLES_SEEKERS
         for seeker in providers:
@@ -138,7 +138,7 @@ def getSubtitlesSimple(self, updateCB=None, title=None, filepath=None, langs=Non
 
     def getSubtitles(self, providers, updateCB=None, title=None, filepath=None, langs=None, year=None, tvshow=None, season=None, episode=None, timeout=10):
         self.log.info('getting subtitles list - title: %s, filepath: %s, year: %s, tvshow: %s, season: %s, episode: %s' % (
-            toString(title), toString(filepath), toString(year), toString(tvshow), toString(season), toString(episode)))
+            title, filepath, year, tvshow, season, episode))
         subtitlesDict = {}
         threads = []
         socket.setdefaulttimeout(timeout)
@@ -215,7 +215,7 @@ def sortLangs(x):
         return subtitles_list
 
     def downloadSubtitle(self, selected_subtitle, subtitles_dict, choosefile_cb, path=None, fname=None, overwrite_cb=None, settings=None):
-        self.log.info('downloading subtitle "%s" with settings "%s"' % (selected_subtitle['filename'], toString(settings) or {}))
+        self.log.info('downloading subtitle "%s" with settings "%s"' % (selected_subtitle['filename'], settings or {}))
         if settings is None:
             settings = {}
         seeker = None
@@ -231,7 +231,7 @@ def downloadSubtitle(self, selected_subtitle, subtitles_dict, choosefile_cb, pat
             subfiles = self._unpack_subtitles(filepath, self.tmp_path)
         else:
             subfiles = [filepath]
-        subfiles = [toString(s) for s in subfiles]
+        subfiles = [s for s in subfiles]
         if len(subfiles) == 0:
             self.log.error("no subtitles were downloaded!")
             raise SubtitlesDownloadError(msg="[error] no subtitles were downloaded")
@@ -247,38 +247,38 @@ def downloadSubtitle(self, selected_subtitle, subtitles_dict, choosefile_cb, pat
             self.log.debug('selected subtitle: "%s"', subfile)
         ext = os.path.splitext(subfile)[1]
         if ext not in self.SUBTILES_EXTENSIONS:
-            ext = os.path.splitext(toString(selected_subtitle['filename']))[1]
+            ext = os.path.splitext(selected_subtitle['filename'])[1]
             if ext not in self.SUBTILES_EXTENSIONS:
                 ext = '.srt'
         if fname is None:
             filename = os.path.basename(subfile)
             save_as = settings.get('save_as', 'default')
             if save_as == 'version':
                 self.log.debug('filename creating by "version" setting')
-                filename = toString(selected_subtitle['filename'])
+                filename = selected_subtitle['filename']
 				# Sanitize the filename to remove slashes and double dots
                 filename = sub(r'[\\/]', '_', filename)  # Replace slashes with underscores
                 filename = sub(r'\.\.', '.', filename)  # Replace double dots with a single dot
                 if os.path.splitext(filename)[1] not in self.SUBTILES_EXTENSIONS:
                     filename = os.path.splitext(filename)[0] + ext
             elif save_as == 'video':
                 self.log.debug('filename creating by "video" setting')
-                videopath = toString(subtitles_dict[seeker.id]['params'].get('filepath'))
+                videopath = subtitles_dict[seeker.id]['params'].get('filepath')
                 filename = os.path.splitext(os.path.basename(videopath))[0] + ext
 
             if settings.get('lang_to_filename', False):
-                lang_iso639_1_2 = toString(languageTranslate(lang, 0, 2))
+                lang_iso639_1_2 = languageTranslate(lang, 0, 2)
                 self.log.debug('appending language "%s" to filename', lang_iso639_1_2)
                 filename, ext = os.path.splitext(filename)
                 filename = "%s.%s%s" % (filename, lang_iso639_1_2, ext)
         else:
             self.log.debug('using provided filename')
-            filename = toString(fname) + ext
+            filename = fname + ext
         self.log.debug('filename: "%s"', filename)
-        download_path = os.path.join(toString(self.download_path), filename)
+        download_path = os.path.join(self.download_path, filename)
         if path is not None:
             self.log.debug('using custom download path: "%s"', path)
-            download_path = os.path.join(toString(path), filename)
+            download_path = os.path.join(path, filename)
         self.log.debug('download path: "%s"', download_path)
 
 		# Ensure the destination directory exists

plugin/seekers/seeker.py

@@ -176,9 +176,9 @@ def download(self, subtitles, selected_subtitle, path=None):
 
         raises SubtitlesDownloadError
         """
-        self.log.info("download - selected_subtitle: %s, path: %s" % (toString(selected_subtitle['filename']), toString(path)))
+        self.log.info("download - selected_subtitle: %s, path: %s" % (selected_subtitle['filename'], path))
         try:
-            compressed, lang, filepath = self._download(subtitles, selected_subtitle, toString(path))
+            compressed, lang, filepath = self._download(subtitles, selected_subtitle, path)
         except SubtitlesDownloadError as e:
             self.log.error("download error occured: %s" % str(e))
             e.provider = self.id
@@ -192,7 +192,7 @@ def download(self, subtitles, selected_subtitle, path=None):
             err.wrapped_error = exc_value
             raise err
 
-        self.log.info("download finished, compressed: %s, lang: %s, filepath:%s" % (toString(compressed), toString(lang), toString(filepath)))
+        self.log.info("download finished, compressed: %s, lang: %s, filepath:%s" % (compressed, lang, filepath))
         return compressed, lang, filepath
 
     def _download(self, subtitles, selected_subtitle, path):

plugin/seekers/utilities.py

@@ -443,37 +443,33 @@ def set_log_level(self, level):
     def error(self, text, *args):
         if self.log_level >= self.LOG_ERROR:
             text = self._eval_message(text, args)
-            text = "[error] {0}".format(toString(text))
+            text = "[error] {0}".format(text)
             out = self._format_output(text)
             self._out_fnc(out)
 
     def info(self, text, *args):
         if self.log_level >= self.LOG_INFO:
             text = self._eval_message(text, args)
-            text = "[info] {0}".format(toString(text))
+            text = "[info] {0}".format(text)
             out = self._format_output(text)
             self._out_fnc(out)
 
     def debug(self, text, *args):
         if self.log_level == self.LOG_DEBUG:
             text = self._eval_message(text, args)
-            text = "[debug] {0}".format(toString(text))
+            text = "[debug] {0}".format(text)
             out = self._format_output(text)
             self._out_fnc(out)
 
     def _eval_message(self, text, *args):
         if len(args) == 1 and isinstance(args[0], tuple):
-            text = text % toString(args[0])
+            text = text % args[0]
         elif len(args) >= 1:
-            text = text % tuple([toString(a) for a in args])
+            text = text % tuple([a for a in args])
         return text
 
     def _format_output(self, text):
         return self.LOG_FORMAT.format(self.prefix_name, text)
 
     def _out_fnc(self, text):
         print(text)
-
-
-def toString(text):
-    return text

plugin/subtitles.py

@@ -769,9 +769,9 @@ def __init__(self, session=None, subsPath=None, defaultPath=None, forceDefaultPa
 
             self.onClose.append(self.exitSubs)
 
-        if defaultPath is not None and os.path.isdir(toString(defaultPath)):
-            self.__defaultPath = toString(defaultPath)
-            self.__subsDir = toString(defaultPath)
+        if defaultPath is not None and os.path.isdir(defaultPath):
+            self.__defaultPath = defaultPath
+            self.__subsDir = defaultPath
 
         if subsPath is not None and self.__autoLoad:
             self.loadSubs(subsPath)
@@ -791,7 +791,6 @@ def loadSubs(self, subsPath, newService=True):
             self.__subsDir = None
 
         if subsPath is not None:
-            subsPath = toString(subsPath)
             if not subsPath.startswith('http'):
                 if self.__defaultPath is not None and self.__forceDefaultPath:
                     self.__subsDir = self.__defaultPath
@@ -1458,7 +1457,7 @@ def setSubtitle(self, sub):
         if color == "default":
             color = self.font[sub['style']]['color']
         self.setColor(color)
-        self["subtitles"].setText(toString(sub['text']))
+        self["subtitles"].setText(sub['text'])
         self.subShown = True
 
     def hideSubtitle(self):
@@ -1910,7 +1909,7 @@ def initSubInfo(self):
             self["subfile_label"].setText(_("Embedded Subtitles"))
             self["subfile_label"].instance.setForegroundColor(parseColor("#ffff00"))
         elif self.subfile is not None:
-            self["subfile_label"].setText(toString(os.path.split(self.subfile)[1]))
+            self["subfile_label"].setText(os.path.split(self.subfile)[1])
             self["subfile_label"].instance.setForegroundColor(parseColor("#DAA520"))
 
             if self.newSelection:
@@ -2244,9 +2243,9 @@ def buildMenu(self):
 def FileEntryComponent(name, absolute=None, isDir=False):
     res = [(absolute, isDir)]
     if isFullHD():
-        res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 770, 30, 1, RT_HALIGN_LEFT, toString(name)))
+        res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 770, 30, 1, RT_HALIGN_LEFT, name))
     else:
-        res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 570, 30, 0, RT_HALIGN_LEFT, toString(name)))
+        res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 570, 30, 0, RT_HALIGN_LEFT, name))
     if isDir:
         png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "extensions/directory.png"))
     else:
@@ -2579,7 +2578,7 @@ class InfoScreen(Screen):
 
         def __init__(self, session, subtitle):
             Screen.__init__(self, session)
-            self["path"] = StaticText(_(toString(subtitle['fpath'])))
+            self["path"] = StaticText(_(subtitle['fpath']))
 
     skin = """
     <screen  position="center,center" size="700,520" zPosition="3" resolution="1280,720">
@@ -2662,14 +2661,14 @@ def updateSubsList(self):
         imgDict = {'unk': loadPNG(os.path.join(os.path.dirname(__file__), 'img', 'countries', 'UNK.png'))}
         subtitleListGUI = []
         for sub in self.subtitles[:]:
-            fpath = toString(sub['fpath'])
+            fpath = sub['fpath']
             if not os.path.isfile(fpath):
                 self.subtitles.remove(sub)
                 continue
             if sub.get('country', 'unk') not in imgDict:
                 countryImgPath = os.path.join(os.path.dirname(__file__), 'img', 'countries', sub['country'] + '.png')
                 if os.path.isfile(countryImgPath):
-                    imgDict[sub['country']] = loadPNG(toString(countryImgPath))
+                    imgDict[sub['country']] = loadPNG(countryImgPath)
                     countryPng = imgDict[sub['country']]
                 else:
                     countryPng = imgDict['unk']
@@ -2679,7 +2678,7 @@ def updateSubsList(self):
                 color = 0xffffff
             date = datetime.fromtimestamp(os.path.getctime(fpath)).strftime("%d-%m-%Y %H:%M")
             name = os.path.splitext(os.path.basename(fpath))[0]
-            subtitleListGUI.append((countryPng, toString(name), toString(sub['provider']), date, color),)
+            subtitleListGUI.append((countryPng, name, sub['provider'], date, color),)
         imgDict = None
         self['subtitles'].list = subtitleListGUI
 
@@ -2719,14 +2718,14 @@ def removeEntryCB(doRemove=False):
             subtitle = self.subtitles[self["subtitles"].index]
             if self.historySettings.removeAction.value == 'file':
                 if self.historySettings.removeActionAsk.value:
-                    message = _("Subtitle") + " '" + toString(subtitle['name']) + "' " + _("will be removed from file system")
+                    message = _("Subtitle") + " '" + subtitle['name'] + "' " + _("will be removed from file system")
                     message += "\n\n" + _("Do you want to proceed?")
                     self.session.openWithCallback(removeEntryCB, MessageBox, message, type=MessageBox.TYPE_YESNO)
                 else:
                     removeEntryCB(True)
             else:
                 if self.historySettings.removeActionAsk.value:
-                    message = _("Subtitle") + " '" + toString(subtitle['name']) + "' " + _("will be removed from list")
+                    message = _("Subtitle") + " '" + subtitle['name'] + "' " + _("will be removed from list")
                     message += "\n\n" + _("Do you want to proceed?")
                     self.session.openWithCallback(removeEntryCB, MessageBox, message, type=MessageBox.TYPE_YESNO)
                 else:
@@ -3115,7 +3114,7 @@ def __init__(self, session, title, configTextWithSuggestions, positionX, titleCo
         Screen.__init__(self, session)
         self.list = []
         self["suggestionslist"] = List(self.list)
-        self["suggestionstitle"] = StaticText(toString(title))
+        self["suggestionstitle"] = StaticText(title)
         self.configTextWithSuggestion = configTextWithSuggestions
 
     def update(self, suggestions):
@@ -3126,7 +3125,7 @@ def update(self, suggestions):
             suggestions.reverse()
             self.list = []
             for s in suggestions:
-                self.list.append((toString(s['name']),))
+                self.list.append((s['name'],))
             self["suggestionslist"].setList(self.list)
             self["suggestionslist"].setIndex(0)
             print(suggestions)
@@ -3570,15 +3569,15 @@ def editFnameCB(callback=None):
                 self.buildMenu()
                 self.updateFName()
         from Screens.VirtualKeyBoard import VirtualKeyBoard
-        self.session.openWithCallback(editFnameCB, VirtualKeyBoard, _("Edit Filename"), text=toString(self.fname.strip()))
+        self.session.openWithCallback(editFnameCB, VirtualKeyBoard, _("Edit Filename"), text=self.fname.strip())
 
     def editDPath(self):
         def editDPathCB(callback=None):
             if callback is not None and len(callback):
                 self.dpath = callback
                 self.configSaveTo.value = "custom"
                 self["config"].invalidate(self.configSaveTo)
-        self.session.openWithCallback(editDPathCB, LocationBox, _("Edit download path"), currDir=toString(self.dpath.strip()))
+        self.session.openWithCallback(editDPathCB, LocationBox, _("Edit download path"), currDir=self.dpath.strip())
 
     def confirm(self):
         if not self.fname.strip():
@@ -3670,7 +3669,7 @@ def left(self):
         self["context_menu"].selectPrevious()
 
     def updateGUI(self, subtitle, options):
-        self["subtitle_release"].text = toString(subtitle['filename'])
+        self["subtitle_release"].text = subtitle['filename']
         self["context_menu"].list = [(o[0],) for o in options]
         self.options = options
 
@@ -3933,8 +3932,8 @@ def updateSubsList(self):  # TODO get country imgages from default skin
                 else:
                     countryPng = imgDict['unk']
             syncPng = sync and imgDict['sync'] or None
-            subtitleListGUI.append((countryPng, _(toString(sub['language_name'])),
-                toString(sub['filename']), toString(sub['provider']), syncPng),)
+            subtitleListGUI.append((countryPng, _(sub['language_name']),
+                sub['filename'], sub['provider'], syncPng),)
         imgDict = None
         self['subtitles'].list = subtitleListGUI
 
@@ -4194,7 +4193,7 @@ def delayCB(seconds, resultCB):
         SubsSearchProcess().start(params, callbacks)
 
     def downloadSubsSuccess(self, subFile):
-        print('[SubsSearch] download success %s' % toString(subFile))
+        print('[SubsSearch] download success %s' % subFile)
         dsubtitle = {
             "name": toUnicode(os.path.basename(subFile)),
             "country": toUnicode(self.__downloadingSubtitle['country']),
@@ -4509,7 +4508,7 @@ def updateProvidersList(self):
             else:
                 providerState = _("disabled")
                 providerStateColor = 0xffff00
-            providerListGUI.append((toString(providerName), providerLangs, providerState, providerStateColor))
+            providerListGUI.append((providerName, providerLangs, providerState, providerStateColor))
         self['providers'].list = providerListGUI
 
     def setConfigFocus(self):
@@ -4938,7 +4937,7 @@ def removeSuggestionWindows(self):
 
 class SubsSearchProviderMenu(BaseMenuScreen):
     def __init__(self, session, provider):
-        title = toString(provider.provider_name) + " " + _("settings")
+        title = provider.provider_name + " " + _("settings")
         BaseMenuScreen.__init__(self, session, title)
         self.provider = provider
 

plugin/utils.py

@@ -24,10 +24,6 @@ def load(subpath):
             return ""
 
 
-def toString(text):
-    return text
-
-
 def toUnicode(text):
     if isinstance(text, bytes):
         text = text.decode("UTF-8", errors='ignore')
@@ -106,29 +102,29 @@ def set_log_level(self, level):
     def error(self, text, *args):
         if self.log_level >= self.LOG_ERROR:
             text = self._eval_message(text, args)
-            text = "[error] {0}".format(toString(text))
+            text = "[error] {0}".format(text)
             out = self._format_output(text)
             self._out_fnc(out)
 
     def info(self, text, *args):
         if self.log_level >= self.LOG_INFO:
             text = self._eval_message(text, args)
-            text = "[info] {0}".format(toString(text))
+            text = "[info] {0}".format(text)
             out = self._format_output(text)
             self._out_fnc(out)
 
     def debug(self, text, *args):
         if self.log_level == self.LOG_DEBUG:
             text = self._eval_message(text, args)
-            text = "[debug] {0}".format(toString(text))
+            text = "[debug] {0}".format(text)
             out = self._format_output(text)
             self._out_fnc(out)
 
     def _eval_message(self, text, *args):
         if len(args) == 1 and isinstance(args[0], tuple):
-                text = text % toString(args[0])
+                text = text % args[0]
         elif len(args) >= 1:
-            text = text % tuple([toString(a) for a in args])
+            text = text % tuple([a for a in args])
         return text
 
     def _format_output(self, text):