From db382f115cda4843248e8c849d204459fbe10452 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Sun, 20 Dec 2015 23:11:05 +0200 Subject: [SimpleHoster] update --- module/plugins/internal/SimpleHoster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/SimpleHoster.py') diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index b67c12da7..44270e7b2 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.plugins.internal.utils import (encode, parse_name, parse_size, class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "2.08" + __version__ = "2.09" __status__ = "stable" __pattern__ = r'^unmatchable$' @@ -277,7 +277,7 @@ class SimpleHoster(Hoster): self.log_info(_("Processing as free download...")) self.handle_free(pyfile) - if not self.last_download: + if self.link and not self.last_download: self.log_info(_("Downloading file...")) self.download(self.link, disposition=self.DISPOSITION) -- cgit v1.2.3 From 4e7b9e94978c7271e66dbe794c925093838a19c4 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Mon, 21 Dec 2015 00:21:42 +0200 Subject: [SimpleHoster] update (2) --- module/plugins/internal/SimpleHoster.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'module/plugins/internal/SimpleHoster.py') diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 44270e7b2..2cf55950e 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.plugins.internal.utils import (encode, parse_name, parse_size, class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "2.09" + __version__ = "2.10" __status__ = "stable" __pattern__ = r'^unmatchable$' @@ -277,7 +277,10 @@ class SimpleHoster(Hoster): self.log_info(_("Processing as free download...")) self.handle_free(pyfile) - if self.link and not self.last_download: + if not self.link: + self.error(_("%s download link not found") % ("Premium" if self.premium else "Free")) + + if self.last_download: self.log_info(_("Downloading file...")) self.download(self.link, disposition=self.DISPOSITION) @@ -431,9 +434,7 @@ class SimpleHoster(Hoster): self.log_warning(_("Free download not implemented")) m = re.search(self.LINK_FREE_PATTERN, self.data) - if m is None: - self.error(_("Free download link not found")) - else: + if m is not None: self.link = m.group(1) @@ -443,7 +444,5 @@ class SimpleHoster(Hoster): self.restart(premium=False) m = re.search(self.LINK_PREMIUM_PATTERN, self.data) - if m is None: - self.error(_("Premium download link not found")) - else: + if m is not None: self.link = m.group(1) -- cgit v1.2.3 From 55e28e3b6166bc5d8e6c8c3b6f7ecd94c8555c7c Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Mon, 21 Dec 2015 00:27:58 +0200 Subject: [SimpleHoster] update (3) --- module/plugins/internal/SimpleHoster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/SimpleHoster.py') diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 2cf55950e..14dd71df3 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.plugins.internal.utils import (encode, parse_name, parse_size, class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "2.10" + __version__ = "2.11" __status__ = "stable" __pattern__ = r'^unmatchable$' @@ -431,7 +431,7 @@ class SimpleHoster(Hoster): def handle_free(self, pyfile): if not self.LINK_FREE_PATTERN: - self.log_warning(_("Free download not implemented")) + self.error(_("Free download not implemented")) m = re.search(self.LINK_FREE_PATTERN, self.data) if m is not None: -- cgit v1.2.3 From 6229218f0b0e9eb937715daf50c6030091d1a3b9 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Mon, 21 Dec 2015 00:42:56 +0200 Subject: [SimpleHoster] update (4) --- module/plugins/internal/SimpleHoster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/SimpleHoster.py') diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 14dd71df3..bcc0dfebe 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.plugins.internal.utils import (encode, parse_name, parse_size, class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "2.11" + __version__ = "2.12" __status__ = "stable" __pattern__ = r'^unmatchable$' @@ -280,7 +280,7 @@ class SimpleHoster(Hoster): if not self.link: self.error(_("%s download link not found") % ("Premium" if self.premium else "Free")) - if self.last_download: + if not self.last_download: self.log_info(_("Downloading file...")) self.download(self.link, disposition=self.DISPOSITION) -- cgit v1.2.3 From c6b0d1ae7f889dfcbecafec380b844daa9b78d83 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Mon, 21 Dec 2015 00:53:22 +0200 Subject: [SimpleHoster] update (5) --- module/plugins/internal/SimpleHoster.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/SimpleHoster.py') diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index bcc0dfebe..303e84174 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.plugins.internal.utils import (encode, parse_name, parse_size, class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "2.12" + __version__ = "2.13" __status__ = "stable" __pattern__ = r'^unmatchable$' @@ -277,8 +277,8 @@ class SimpleHoster(Hoster): self.log_info(_("Processing as free download...")) self.handle_free(pyfile) - if not self.link: - self.error(_("%s download link not found") % ("Premium" if self.premium else "Free")) + if not self.link: + self.error(_("%s download link not found") % ("Premium" if self.premium else "Free")) if not self.last_download: self.log_info(_("Downloading file...")) -- cgit v1.2.3 From 9d98c0986d423a6f2f7cdf043639ded908e3c559 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Mon, 21 Dec 2015 02:32:25 +0200 Subject: [SimpleHoster] update (6) --- module/plugins/internal/SimpleHoster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/SimpleHoster.py') diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 303e84174..4d7697d57 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.plugins.internal.utils import (encode, parse_name, parse_size, class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "2.13" + __version__ = "2.14" __status__ = "stable" __pattern__ = r'^unmatchable$' @@ -277,7 +277,7 @@ class SimpleHoster(Hoster): self.log_info(_("Processing as free download...")) self.handle_free(pyfile) - if not self.link: + if not self.link and not self.last_download: self.error(_("%s download link not found") % ("Premium" if self.premium else "Free")) if not self.last_download: -- cgit v1.2.3