summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/hooks/ExtractArchive.py15
-rw-r--r--module/plugins/internal/Extractor.py10
-rw-r--r--module/plugins/internal/SevenZip.py16
-rw-r--r--module/plugins/internal/UnRar.py62
-rw-r--r--module/plugins/internal/UnZip.py3
5 files changed, 55 insertions, 51 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index a0c0ca366..3ea8839dc 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -104,7 +104,7 @@ class ArchiveQueue(object):
class ExtractArchive(Hook):
__name__ = "ExtractArchive"
__type__ = "hook"
- __version__ = "1.28"
+ __version__ = "1.29"
__config__ = [("activated" , "bool" , "Activated" , True ),
("fullpath" , "bool" , "Extract with full paths" , True ),
@@ -124,7 +124,8 @@ class ExtractArchive(Hook):
__description__ = """Extract different kind of archives"""
__license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("Walter Purcaro", "vuolter@gmail.com"),
+ ("Immenz" , "immenz@gmx.net" )]
event_list = ["allDownloadsProcessed"]
@@ -171,7 +172,7 @@ class ExtractArchive(Hook):
print_exc()
if self.extractors:
- self.logInfo(_("Activated") + " " + " ".join(Extractor.__name__ for Extractor in self.extractors))
+ self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name__,Extractor.VERSION) for Extractor in self.extractors))
if self.getConfig("waitall"):
self.extractPackage(*self.queue.get()) #: Resume unfinished extractions
@@ -277,13 +278,6 @@ class ExtractArchive(Hook):
for fname, fid, fout in targets:
name = os.path.basename(fname)
- pname = replace_patterns(fname, self.NAME_REPLACEMENTS)
- if pname not in processed:
- processed.append(pname) #: prevent extracting same file twice
- else:
- self.logDebug(name, "Skipped")
- continue
-
if not os.path.exists(fname):
self.logDebug(name, "File not found")
continue
@@ -309,6 +303,7 @@ class ExtractArchive(Hook):
success = False
continue
+ files_ids.remove((fname, fid, fout)) # don't let other extractors spam log
self.logDebug("Extracted files: %s" % new_files)
self.setPermissions(new_files)
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index a5a8756d8..56860ad53 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -19,7 +19,7 @@ class PasswordError(Exception):
class Extractor:
__name__ = "Extractor"
- __version__ = "0.19"
+ __version__ = "0.20"
__description__ = """Base extractor plugin"""
__license__ = "GPLv3"
@@ -28,12 +28,18 @@ class Extractor:
EXTENSIONS = []
+ VERSION = ""
@classmethod
def isArchive(cls, filename):
name = os.path.basename(filename).lower()
- return any(name.endswith(ext) for ext in cls.EXTENSIONS)
+ return any(name.endswith(ext) for ext in cls.EXTENSIONS) and not cls.isMultipart(filename)
+
+
+ @classmethod
+ def isMultipart(cls,filename):
+ return False
@classmethod
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 96e664573..7ad6b0d7a 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
class SevenZip(UnRar):
__name__ = "SevenZip"
- __version__ = "0.07"
+ __version__ = "0.08"
__description__ = """7-Zip extractor plugin"""
__license__ = "GPLv3"
@@ -19,7 +19,8 @@ class SevenZip(UnRar):
("Walter Purcaro", "vuolter@gmail.com")]
- CMD = "7z"
+ CMD = "7z"
+ VERSION = ""
EXTENSIONS = [".7z", ".xz", ".zip", ".gz", ".gzip", ".tgz", ".bz2", ".bzip2",
".tbz2", ".tbz", ".tar", ".wim", ".swm", ".lzma", ".rar", ".cab",
@@ -33,6 +34,7 @@ class SevenZip(UnRar):
re_filelist = re.compile(r'([\d\:]+)\s+([\d\:]+)\s+([\w\.]+)\s+(\d+)\s+(\d+)\s+(.+)')
re_wrongpwd = re.compile(r'(Can not open encrypted archive|Wrong password)', re.I)
re_wrongcrc = re.compile(r'Encrypted\s+\=\s+\+', re.I)
+ re_version = re.compile(r'7-Zip\s(?:\[64\]\s)?(\d+\.\d+)', re.I)
@classmethod
@@ -40,10 +42,12 @@ class SevenZip(UnRar):
if os.name == "nt":
cls.CMD = os.path.join(pypath, "7z.exe")
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
- p.communicate()
+ out,err = p.communicate()
else:
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
- p.communicate()
+ out, err = p.communicate()
+
+ cls.VERSION = cls.re_version.search(out).group(1)
return True
@@ -143,9 +147,9 @@ class SevenZip(UnRar):
args.append("-p-")
#@NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
- call = [self.cmd, command] + args + list(xargs)
+ call = [self.CMD, command] + args + list(xargs)
- self.manager.logDebug(" ".join(map(decode, call)))
+ self.manager.logDebug(" ".join(call))
p = Popen(call, stdout=PIPE, stderr=PIPE)
return p
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 0ba990006..f6ca5a2eb 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -22,7 +22,7 @@ def renice(pid, value):
class UnRar(Extractor):
__name__ = "UnRar"
- __version__ = "1.11"
+ __version__ = "1.12"
__description__ = """Rar extractor plugin"""
__license__ = "GPLv3"
@@ -31,42 +31,53 @@ class UnRar(Extractor):
CMD = "unrar"
+ VERSION = ""
- # TODO: Find out what Filetypes Unrar supports exactly
- EXTENSIONS = [".rar", ".cab", ".arj", ".lzh", ".tar", ".gz", ".bz2",
- ".ace", ".uue", ".jar", ".iso", ".7z", ".xz", ".z"]
+ EXTENSIONS = [".rar"]
- #@NOTE: there are some more uncovered rar formats
- re_rarpart1 = re.compile(r'\.part(\d+)\.rar$', re.I)
- re_rarpart2 = re.compile(r'\.r(\d+)$', re.I)
+
+ re_multipart = re.compile(r'\.(part|r)(\d+)(?:\.rar)?',re.I)
re_filefixed = re.compile(r'Building (.+)')
- re_filelist = re.compile(r'(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
+ re_filelist = re.compile(r'^(.)(\s*[\w\.\-]+)\s+(\d+\s+)+(?:\d+\%\s+)?[\d\-]{8}\s+[\d\:]{5}', re.M|re.I)
re_wrongpwd = re.compile(r'password', re.I)
re_wrongcrc = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
- re_version = re.compile(r'UNRAR\s(\d+)\.\d+', re.I)
+ re_version = re.compile(r'UNRAR\s(\d+\.\d+)', re.I)
+
@classmethod
def isUsable(cls):
if os.name == "nt":
cls.CMD = os.path.join(pypath, "UnRAR.exe")
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
- p.communicate()
+ out, err = p.communicate()
else:
try:
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
- p.communicate()
+ out, err = p.communicate()
except OSError: #: fallback to rar
cls.CMD = "rar"
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
- p.communicate()
+ out, err = p.communicate()
+
+ cls.VERSION = cls.re_version.search(out).group(1)
return True
+ @classmethod
+ def isMultipart(cls,filename):
+ multipart = cls.re_multipart.search(filename)
+ if multipart:
+ # First Multipart file (part1.rar for *.part1-9.rar format or *.rar for .r1-9 format) handled as normal Archive
+ return False if (multipart.group(1) == "part" and int(multipart.group(2)) == 1) else True
+
+ return False
+
+
def check(self):
p = self.call_cmd("l", "-v", fs_encode(self.filename))
out, err = p.communicate()
@@ -162,23 +173,14 @@ class UnRar(Extractor):
def getDeleteFiles(self):
- files = []
+ dir, name = os.path.split(self.filename)
- for i in (1, 2):
- try:
- dir, name = os.path.split(self.filename)
-
- part = getattr(self, "re_rarpart%d" % i).search(name).group(1)
- new_name = name[::-1].replace((".part%s.rar" % part)[::-1], ".part*.rar"[::-1], 1)[::-1]
- file = fs_encode(os.path.join(dir, new_name))
-
- files.extend(glob(file))
+ # actually extracted file
+ files = [self.filename]
- except Exception:
- continue
-
- if self.filename not in files:
- files.insert(0, self.filename)
+ # eventually Multipart Files
+ files.extend(save_join(self.out, os.path.basename(file)) for file in filter(self.isMultipart, os.listdir(dir))
+ if re.sub(self.re_multipart,".rar",name) == re.sub(self.re_multipart,".rar",file))
return files
@@ -186,10 +188,6 @@ class UnRar(Extractor):
def list(self, password=None):
command = "vb" if self.fullpath else "lb"
- p = self.call_cmd("", "", fs_encode(self.filename))
- out, err = p.communicate()
- version = self.re_version.search(out).group(1)
-
p = self.call_cmd(command, "-v", fs_encode(self.filename), password=password)
out, err = p.communicate()
@@ -200,7 +198,7 @@ class UnRar(Extractor):
self.manager.logError(err.strip())
result = set()
- if not self.fullpath and version =='5':
+ if not self.fullpath and self.rarversion.startswith('5'):
# NOTE: Unrar 5 always list full path
for f in decode(out).splitlines():
f = save_join(self.out, os.path.basename(f.strip()))
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index f81c235c1..caa0ecc0c 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -12,7 +12,7 @@ from module.utils import fs_encode
class UnZip(Extractor):
__name__ = "UnZip"
- __version__ = "1.08"
+ __version__ = "1.09"
__description__ = """Zip extractor plugin"""
__license__ = "GPLv3"
@@ -20,6 +20,7 @@ class UnZip(Extractor):
EXTENSIONS = [".zip", ".zip64"]
+ VERSION ="(python %s.%s.%s)" % (sys.version_info.major, sys.version_info.minor, sys.version_info.micro)
@classmethod
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 01:51:55 +0100