diff options
Diffstat (limited to 'module/plugins/hooks/UnSkipOnFail.py')
| -rw-r--r-- | module/plugins/hooks/UnSkipOnFail.py | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py index 6842cbc51..db43bca2b 100644 --- a/module/plugins/hooks/UnSkipOnFail.py +++ b/module/plugins/hooks/UnSkipOnFail.py @@ -7,7 +7,7 @@ from module.plugins.internal.Addon import Addon class UnSkipOnFail(Addon): __name__ = "UnSkipOnFail" __type__ = "hook" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __config__ = [("activated", "bool", "Activated", True)] @@ -18,10 +18,6 @@ class UnSkipOnFail(Addon): def download_failed(self, pyfile): - #: Check if pyfile is still "failed", maybe might has been restarted in meantime - if pyfile.status != 8: - return - msg = _("Looking for skipped duplicates of: %s (pid:%s)") self.log_info(msg % (pyfile.name, pyfile.package().id)) @@ -36,12 +32,12 @@ class UnSkipOnFail(Addon): #: It creates a temporary PyFile object using #: "link" data, changes its status, and tells #: The pyload.files-manager to save its data. - pylink = self._pyfile(link) + pyfile_new = self._create_pyFile(link) - pylink.setCustomStatus(_("unskipped"), "queued") + pyfile_new.setCustomStatus(_("unskipped"), "queued") self.pyload.files.save() - pylink.release() + pyfile_new.release() else: self.log_info(_("No duplicates found")) @@ -57,18 +53,16 @@ class UnSkipOnFail(Addon): the data for "pyfile" iotselöf. It does MOT check the link's status. """ - queue = self.pyload.api.getQueue() #: Get packages (w/o files, as most file data is useless here) - - for package in queue: + for pinfo in self.pyload.api.getQueue(): #: Check if package-folder equals pyfile's package folder - if package.folder is not pyfile.package().folder: + if pinfo.folder is not pyfile.package().folder: continue #: Now get packaged data w/ files/links - pdata = self.pyload.api.getPackageData(package.pid) + pdata = self.pyload.api.getPackageData(pinfo.pid) for link in pdata.links: #: Check if link == "skipped" - if link.status != 4: + if link.status is not 4: continue #: Check if link name collides with pdata's name @@ -77,14 +71,14 @@ class UnSkipOnFail(Addon): return link - def _pyfile(self, link): + def _create_pyFile(self, pylink): return PyFile(self.pyload.files, - link.fid, - link.url, - link.name, - link.size, - link.status, - link.error, - link.plugin, - link.packageID, - link.order) + pylink.fid, + pylink.url, + pylink.name, + pylink.size, + pylink.status, + pylink.error, + pylink.plugin, + pylink.packageID, + pylink.order) |