summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/addon/ExtractArchive.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugin/addon/ExtractArchive.py')
-rw-r--r--pyload/plugin/addon/ExtractArchive.py136
1 files changed, 84 insertions, 52 deletions
diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py
index 9cd8fad62..29b2165ca 100644
--- a/pyload/plugin/addon/ExtractArchive.py
+++ b/pyload/plugin/addon/ExtractArchive.py
@@ -104,13 +104,14 @@ class ArchiveQueue(object):
class ExtractArchive(Addon):
__name = "ExtractArchive"
__type = "addon"
- __version = "1.29"
+ __version = "1.30"
__config = [("activated" , "bool" , "Activated" , True ),
("fullpath" , "bool" , "Extract with full paths" , True ),
("overwrite" , "bool" , "Overwrite files" , False ),
("keepbroken" , "bool" , "Try to extract broken archives" , False ),
- ("repair" , "bool" , "Repair broken archives" , True ),
+ ("repair" , "bool" , "Repair broken archives (rar required)" , False ),
+ ("test" , "bool" , "Test archive before extracting" , False ),
("usepasswordfile" , "bool" , "Use password file" , True ),
("passwordfile" , "file" , "Password file" , "archive_password.txt" ),
("delete" , "bool" , "Delete archive when successfully extracted", False ),
@@ -128,7 +129,7 @@ class ExtractArchive(Addon):
("Immenz" , "immenz@gmx.net" )]
- event_list = ["allDownloadsProcessed"]
+ event_list = ["allDownloadsProcessed","packageDeleted"]
NAME_REPLACEMENTS = [(r'\.part\d+\.rar$', ".part.rar")]
@@ -137,21 +138,23 @@ class ExtractArchive(Addon):
self.queue = ArchiveQueue(self, "Queue")
self.failed = ArchiveQueue(self, "Failed")
- self.interval = 60
- self.extracting = False
- self.extractors = []
- self.passwords = []
+ self.interval = 60
+ self.extracting = False
+ self.lastPackage = False
+ self.extractors = []
+ self.passwords = []
+ self.repair = False
def activate(self):
- # self.extracting = False
-
for p in ("UnRar", "SevenZip", "UnZip"):
try:
module = self.core.pluginManager.loadModule("extractor", p)
klass = getattr(module, p)
if klass.isUsable():
self.extractors.append(klass)
+ if klass.REPAIR:
+ self.repair = self.getConfig("repair")
except OSError, e:
if e.errno == 2:
@@ -168,37 +171,49 @@ class ExtractArchive(Addon):
if 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
- else:
- super(ExtractArchive, self).initPeriodical()
-
+ self.extractQueued() #: Resume unfinished extractions
else:
self.logInfo(_("No Extract plugins activated"))
+ @threaded
+ def extractQueued(self,thread):
+ packages = self.queue.get()
+ while packages:
+ if self.lastPackage: # called from allDownloadsProcessed
+ self.lastPackage = False
+ if self.extract(packages, thread): #@NOTE: check only if all gone fine, no failed reporting for now
+ self.manager.dispatchEvent("all_archives_extracted")
+ self.manager.dispatchEvent("all_archives_processed")
+ else:
+ if self.extract(packages, thread): #@NOTE: check only if all gone fine, no failed reporting for now
+ pass
- def periodical(self):
- if not self.extracting:
- self.extractPackage(*self.queue.get())
+ packages = self.queue.get() # check for packages added during extraction
@Expose
def extractPackage(self, *ids):
""" Extract packages with given id"""
- self.manager.startThread(self.extract, ids)
+ for id in ids:
+ self.queue.add(id)
+ if not self.getConfig("waitall") and not self.extracting:
+ self.extractQueued()
+
+
+ def packageDeleted(self, pid):
+ self.queue.remove(pid)
def packageFinished(self, pypack):
self.queue.add(pypack.id)
+ if not self.getConfig("waitall") and not self.extracting:
+ self.extractQueued()
- @threaded
- def allDownloadsProcessed(self, thread):
- if self.extract(self.queue.get(), thread): #@NOTE: check only if all gone fine, no failed reporting for now
- self.manager.dispatchEvent("all_archives_extracted")
-
- self.manager.dispatchEvent("all_archives_processed")
+ def allDownloadsProcessed(self):
+ self.lastPackage = True
+ if not self.extracting:
+ self.extractQueued()
def extract(self, ids, thread=None):
@@ -311,12 +326,16 @@ class ExtractArchive(Addon):
if recursive and os.path.isfile(file):
new_files_ids.append((filename, fid, os.path.dirname(filename))) # append as new target
+ pyfile = self.core.files.getFile(fid)
+ self.manager.dispatchEvent("archive_extracted", pyfile, archive.out, archive.filename, new_files)
+
files_ids = new_files_ids # also check extracted files
if matched:
if success:
extracted.append(pid)
self.manager.dispatchEvent("package_extracted", pypack)
+
else:
failed.append(pid)
self.manager.dispatchEvent("package_extract_failed", pypack)
@@ -347,50 +366,65 @@ class ExtractArchive(Addon):
encrypted = False
try:
- try:
- archive.check()
+ self.logDebug("Password: %s" % (password or "None provided"))
+ passwords = uniqify([password] + self.getPasswords(False)) if self.getConfig("usepasswordfile") else [password]
+ for pw in passwords:
+ try:
+ if self.getConfig("test") or self.repair:
+ pyfile.setCustomStatus(_("testing"))
+ if pw:
+ self.logDebug("Testing with password: %s" % pw)
+ pyfile.setProgress(0)
+ archive.test(pw)
+ pyfile.setProgress(100)
+ else:
+ archive.check(pw)
- except CRCError, e:
- self.logDebug(name, e)
- self.logInfo(name, _("Header protected"))
+ self.addPassword(pw)
+ break
- if self.getConfig("repair"):
- self.logWarning(name, _("Repairing..."))
+ except PasswordError:
+ if not encrypted:
+ self.logInfo(name, _("Password protected"))
+ encrypted = True
- pyfile.setCustomStatus(_("repairing"))
- pyfile.setProgress(0)
+ except CRCError, e:
+ self.logDebug(name, e)
+ self.logInfo(name, _("CRC Error"))
- repaired = archive.repair()
+ if self.repair:
+ self.logWarning(name, _("Repairing..."))
- pyfile.setProgress(100)
+ pyfile.setCustomStatus(_("repairing"))
+ pyfile.setProgress(0)
+ repaired = archive.repair()
+ pyfile.setProgress(100)
- if not repaired and not self.getConfig("keepbroken"):
- raise CRCError("Archive damaged")
+ if not repaired and not self.getConfig("keepbroken"):
+ raise CRCError("Archive damaged")
- except PasswordError:
- self.logInfo(name, _("Password protected"))
- encrypted = True
+ self.addPassword(pw)
+ break
- except ArchiveError, e:
- raise ArchiveError(e)
+ raise CRCError("Archive damaged")
- self.logDebug("Password: %s" % (password or "No provided"))
+ except ArchiveError, e:
+ raise ArchiveError(e)
pyfile.setCustomStatus(_("extracting"))
pyfile.setProgress(0)
if not encrypted or not self.getConfig("usepasswordfile"):
+ self.logDebug("Extracting using password: %s" % (password or "None"))
archive.extract(password)
else:
for pw in filter(None, uniqify([password] + self.getPasswords(False))):
try:
- self.logDebug("Try password: %s" % pw)
+ self.logDebug("Extracting using password: %s" % pw)
- ispw = archive.isPassword(pw)
- if ispw or ispw is None:
- archive.extract(pw)
- self.addPassword(pw)
- break
+ archive.extract(pw)
+ self.addPassword(pw)
+ break
except PasswordError:
self.logDebug("Password was wrong")
@@ -414,9 +448,7 @@ class ExtractArchive(Addon):
self.logDebug("%s does not exists" % f)
self.logInfo(name, _("Extracting finished"))
-
extracted_files = archive.files or archive.list()
- self.manager.dispatchEvent("archive_extracted", pyfile, archive.out, archive.filename, extracted_files)
return extracted_files
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 07:57:04 +0100