cleanup

Author: jbleyel

plugin/e2_utils.py

@@ -411,54 +411,6 @@ def setSetting(self, key, val):
             print(repr(self), e, 'cannot set setting:', key, ':', val)
 
 
-def unrar(rarPath, destDir, successCB, errorCB):
-    def rarSubNameCB(result, retval, extra_args):
-        if retval == 0:
-            print('[Unrar] getting rar sub name', result)
-            rarSubNames = result.split('\n')
-            rarPath = extra_args[0]
-            destDir = extra_args[1]
-            try:
-                for subName in rarSubNames:
-                    os.unlink(os.path.join(destDir, subName))
-            except OSError as e:
-                print(e)
-            # unrar needs rar Extension?
-            if os.path.splitext(rarPath)[1] != '.rar':
-                oldRarPath = rarPath
-                rarPath = os.path.splitext(rarPath)[0] + '.rar'
-                shutil.move(oldRarPath, rarPath)
-            cmdRarUnpack = 'unrar e "%s" %s' % (rarPath, destDir)
-            Console().ePopen(toString(cmdRarUnpack), rarUnpackCB, (tuple(rarSubNames),))
-        else:
-            try:
-                os.unlink(extra_args[0])
-            except OSError:
-                pass
-            print('[Unrar] problem when getting rar sub name:', result)
-            errorCB(_("unpack error: cannot get subname"))
-
-    def rarUnpackCB(result, retval, extra_args):
-        if retval == 0:
-            print('[Unrar] successfully unpacked rar archive')
-            result = []
-            rarSubNames = extra_args[0]
-            for subName in rarSubNames:
-                result.append(os.path.join(destDir, subName))
-            successCB(result)
-        else:
-            print('[Unrar] problem when unpacking rar archive', result)
-            try:
-                os.unlink(extra_args[0])
-            except OSError:
-                pass
-            errorCB(_("unpack error: cannot open archive"))
-
-    cmdRarSubName = 'unrar lb "%s"' % rarPath
-    extraArgs = (rarPath, destDir)
-    Console().ePopen(toString(cmdRarSubName), rarSubNameCB, extraArgs)
-
-
 class fps_float(float):
     def __eq__(self, other):
         return "%.3f" % self == "%.3f" % other

plugin/parsers/subrip.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import
-import re
+from re import finditer, search, sub, DOTALL, MULTILINE
 
 from .baseparser import BaseParser, ParseError, HEX_COLORS
 
@@ -12,7 +12,7 @@ def _parse(self, text, fps):
         return self._srt_to_dict(text)
 
     def _removeTags(self, text):
-        return re.sub('<[^>]*>', '', text)
+        return sub('<[^>]*>', '', text)
 
     def _getColor(self, text, color):
         newColor = color
@@ -21,7 +21,7 @@ def _getColor(self, text, color):
                 if text.find('</font>') != -1 or text.find('</Font>') != -1:
                     newColor = 'default'
             else:
-                colorMatch = re.search('<[Ff]ont [Cc]olor=(.+?)>', text, re.DOTALL)
+                colorMatch = search('<[Ff]ont [Cc]olor=(.+?)>', text, DOTALL)
                 colorText = colorMatch and colorMatch.group(1)
                 colorText = colorText and colorText.replace("'", "").replace('"', '')
                 if text.find('</font>') != -1 or text.find('</Font>') != -1:
@@ -30,12 +30,12 @@ def _getColor(self, text, color):
                     newColor = color
         else:
             color = 'default'
-            colorMatch = re.search('<[Ff]ont [Cc]olor=(.+?)>', text, re.DOTALL)
+            colorMatch = search('<[Ff]ont [Cc]olor=(.+?)>', text, DOTALL)
             colorText = colorMatch and colorMatch.group(1) or color
             colorText = colorText.replace("'", "").replace('"', '')
 
         if colorText:
-            hexColor = re.search("(\#[0-9,a-f,A-F]{6})", colorText)
+            hexColor = search("(\#[0-9,a-f,A-F]{6})", colorText)
             if hexColor:
                 color = hexColor.group(1)[1:]
             else:
@@ -90,7 +90,7 @@ def _srt_to_dict(self, srtText):
         subs = []
         idx = 0
         srtText = srtText.replace('\r\n', '\n').strip() + "\n\n"
-        for s in re.finditer(r'(^\d+)\s*\:\s*(\d+)\s*\:\s*(\d+)\s*\,\s*(\d+)\s*-->\s*(\d+)\s*\:\s*(\d+)\s*\:\s*(\d+)\s*\,\s*(\d+)\s*\n(.+?)(?:\n\n|\n\d+\s*\n)', srtText, re.DOTALL | re.MULTILINE):
+        for s in finditer(r'(^\d+)\s*\:\s*(\d+)\s*\:\s*(\d+)\s*\,\s*(\d+)\s*-->\s*(\d+)\s*\:\s*(\d+)\s*\:\s*(\d+)\s*\,\s*(\d+)\s*\n(.+?)(?:\n\n|\n\d+\s*\n)', srtText, DOTALL | MULTILINE):
             try:
                 idx += 1
                 shour, smin, ssec, smsec = int(s.group(1)), int(s.group(2)), int(s.group(3)), int(s.group(4))

plugin/seekers/Edna/service.py

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 from __future__ import absolute_import
-import os
+from os.path import join
 
 from urllib.parse import urlencode
 from urllib.request import urlopen
@@ -81,7 +81,7 @@ def download_subtitles(subtitles_list, pos, extract_subs, tmp_sub_dir, sub_folde
 	log(__name__, "Subs in %s" % subtitles_format)
 	if subtitles_format in ['srt', 'sub']:
 		compressed = False
-		store_path = os.path.join(sub_folder, subtitles_filename)
+		store_path = join(sub_folder, subtitles_filename)
 		subtitles_file = store_path
 	else:
 		compressed = True

plugin/seekers/Elsubtitle/service.py

@@ -9,14 +9,13 @@
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 warnings.simplefilter('ignore', InsecureRequestWarning)
 import os
-import os.path
+from os.path import exists
 from urllib.request import Request, urlopen
 from urllib.parse import quote_plus, urlencode
 from html.parser import HTMLParser
 
 from .ElsubtitleUtilities import get_language_info
-from ..utilities import languageTranslate, log, getFileSize
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
+from ..utilities import log
 
 HDR = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; rv:85.0) Gecko/20100101 Firefox/85.0',
       'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
@@ -264,7 +263,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/Indexsubtitle/service.py

@@ -9,15 +9,13 @@
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 warnings.simplefilter('ignore', InsecureRequestWarning)
 import os
-import os.path
+from os.path import exists
 from urllib.request import Request, urlopen
-#from urllib.request import FancyURLopener
 from urllib.parse import quote_plus, urlencode
 
 from html.parser import HTMLParser
 from .IndexsubtitleUtilities import get_language_info
-from ..utilities import languageTranslate, log, getFileSize
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
+from ..utilities import log
 
 HDR = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/117.0',
       'Accept': 'application/json, text/javascript, */*; q=0.01',
@@ -169,7 +167,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/Moviesubtitles/service.py

@@ -8,13 +8,12 @@
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 warnings.simplefilter('ignore', InsecureRequestWarning)
 import os
-import os.path
+from os.path import exists
 from urllib.request import Request, urlopen
 from .MoviesubtitlesUtilities import get_language_info
-from ..utilities import languageTranslate, log, getFileSize
+from ..utilities import log
 
 import re
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
 
 
 HDR = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; rv:109.0) Gecko/20100101 Firefox/115.0',
@@ -170,7 +169,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/Moviesubtitles2/service.py

@@ -8,13 +8,12 @@
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 warnings.simplefilter('ignore', InsecureRequestWarning)
 import os
-import os.path
+from os.path import exists
 from urllib.request import Request, urlopen
 from .Moviesubtitles2Utilities import get_language_info
-from ..utilities import languageTranslate, log, getFileSize
+from ..utilities import log
 
 import re
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
 
 
 HDR = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; rv:109.0) Gecko/20100101 Firefox/115.0',
@@ -148,7 +147,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/MySubs/service.py

@@ -9,14 +9,13 @@
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 warnings.simplefilter('ignore', InsecureRequestWarning)
 import os
-import os.path
+from os.path import exists
 from urllib.request import Request, urlopen
 from .MySubsUtilities import get_language_info
-from ..utilities import languageTranslate, log, getFileSize
+from ..utilities import log
 
 import re
 from html.parser import HTMLParser
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
 HDR = {'Host': 'my-subs.co',
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/116.0',
         'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
@@ -218,7 +217,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/Novalermora/service.py

@@ -9,9 +9,8 @@
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 warnings.simplefilter('ignore', InsecureRequestWarning)
 import os
-import os.path
-from ..utilities import languageTranslate, log, getFileSize
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
+from os.path import exists
+from ..utilities import log
 
 from urllib.request import urlopen, Request
 
@@ -114,7 +113,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/OpenSubtitles2/service.py

@@ -2,18 +2,13 @@
 from __future__ import absolute_import
 
 import os
-import re
 import requests
 from .OpenSubtitles2Utilities import get_language_info
-import os.path
-import http.client
-import json
-import sys
+from os.path import exists
 from bs4 import BeautifulSoup
-from urllib.request import HTTPCookieProcessor, build_opener, install_opener, Request, urlopen
+from urllib.request import Request, urlopen
 from urllib.parse import urlencode
-from ..utilities import languageTranslate, getFileSize, log
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
+from ..utilities import log
 
 
 HDR = {
@@ -181,7 +176,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/OpenSubtitlesMora/service.py

@@ -7,8 +7,8 @@
 import re
 import string
 from bs4 import BeautifulSoup
-from .OpensubtitlesmoraUtilities import geturl, get_language_info
-from urllib.parse import quote_plus, urlencode
+from .OpensubtitlesmoraUtilities import get_language_info
+from urllib.parse import quote_plus
 from ..utilities import log
 from html import unescape
 import requests

plugin/seekers/Subdl/service.py

@@ -4,7 +4,7 @@
 
 
 import os
-import os.path
+from os.path import exists
 import re
 import requests
 import warnings
@@ -13,8 +13,6 @@
 from .SubdlUtilities import get_language_info
 from ..utilities import log
 
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
-
 HDR = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:6.0) Gecko/20100101 Firefox/6.0',
       'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
       'Accept-Language': 'fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3',
@@ -112,7 +110,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
             local_file_handle = open(local_tmp_file, 'wb')
             local_file_handle.write(response.content)

plugin/seekers/Subscene/service.py

@@ -4,8 +4,8 @@
 from __future__ import print_function
 import difflib
 import os
-from .SubsceneUtilities import geturl, get_language_info
-from urllib.request import FancyURLopener, urlopen
+from .SubsceneUtilities import get_language_info
+from urllib.request import urlopen
 from urllib.parse import quote_plus, urlencode
 
 from ..utilities import log

plugin/seekers/Subscenebest/service.py

@@ -7,8 +7,8 @@
 import zipfile
 from ..seeker import SubtitlesDownloadError, SubtitlesErrors
 from bs4 import BeautifulSoup
-from .SubscenebestUtilities import geturl, get_language_info
-from urllib.parse import quote_plus, urlencode
+from .SubscenebestUtilities import get_language_info
+from urllib.parse import quote_plus
 from ..utilities import log
 import html
 import re

plugin/seekers/Subsource/service.py

@@ -6,8 +6,8 @@
 import os
 import re
 import string
-from .SubsourceUtilities import geturl, get_language_info
-from urllib.parse import quote_plus, urlencode
+from .SubsourceUtilities import get_language_info
+from urllib.parse import quote_plus
 from ..utilities import log
 import html
 import requests

plugin/seekers/Subsyts/service.py

@@ -9,14 +9,13 @@
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 warnings.simplefilter('ignore', InsecureRequestWarning)
 import os
-import os.path
+from os.path import exists
 from urllib.request import Request, urlopen
 from .SubsytsUtilities import get_language_info
-from ..utilities import languageTranslate, log, getFileSize
+from ..utilities import log
 
 import re
 from html.parser import HTMLParser
-from ..seeker import SubtitlesDownloadError, SubtitlesErrors
 HDR = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:77.0) Gecko/20100101 Firefox/77.0',
       'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
       'Accept-Language': 'fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3',
@@ -186,7 +185,7 @@ def download_subtitles(subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, s
         local_tmp_file = zip_subs
         try:
             log(__name__, "%s Saving subtitles to '%s'" % (debug_pretext, local_tmp_file))
-            if not os.path.exists(tmp_sub_dir):
+            if not exists(tmp_sub_dir):
                 os.makedirs(tmp_sub_dir)
 
             local_file_handle = open(local_tmp_file, 'wb')