From 57300575fa97107d172e0c9909b244c8c8ae6c12 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Dec 2014 20:02:20 +0100 Subject: Extend SimpleHoster in multi-hoster plugins --- module/plugins/hoster/FreeWayMe.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index a27dc04b8..531b49726 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -from module.plugins.Hoster import Hoster +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -class FreeWayMe(Hoster): +class FreeWayMe(SimpleHoster): __name__ = "FreeWayMe" __type__ = "hoster" __version__ = "0.11" @@ -21,16 +21,14 @@ class FreeWayMe(Hoster): self.chunkLimit = 1 - def process(self, pyfile): - if not self.account: - self.logError(_("Please enter your %s account or deactivate this plugin") % "FreeWayMe") - self.fail(_("No FreeWay account provided")) - - self.logDebug("Old URL: %s" % pyfile.url) - - (user, data) = self.account.selectAccount() + def handleMulti(self): + user, data = self.account.selectAccount() + self.link = True self.download( "https://www.free-way.me/load.php", - get={"multiget": 7, "url": pyfile.url, "user": user, "pw": self.account.getpw(user), "json": ""}, + get={"multiget": 7, "url": self.pyfile.url, "user": user, "pw": self.account.getpw(user), "json": ""}, disposition=True) + + +getInfo = create_getInfo(FreeWayMe) -- cgit v1.2.3 From 46f748a94ea5ab62ab0839ff0ce01e12e3eac688 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Dec 2014 21:47:39 +0100 Subject: Extend SimpleHoster in multi-hoster plugins (2) --- module/plugins/hoster/FreeWayMe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 531b49726..307ab7811 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FreeWayMe(SimpleHoster): __name__ = "FreeWayMe" __type__ = "hoster" - __version__ = "0.11" + __version__ = "0.12" __pattern__ = r'https://(?:www\.)?free-way\.me/.*' -- cgit v1.2.3 From 0860e09f5ff16ee3f097f6f9d444f277a38abd72 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Dec 2014 23:03:46 +0100 Subject: Extend SimpleHoster in multi-hoster plugins (3) --- module/plugins/hoster/FreeWayMe.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 307ab7811..9c7344f95 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -15,6 +15,9 @@ class FreeWayMe(SimpleHoster): __authors__ = [("Nicolas Giese", "james@free-way.me")] + MULTI_HOSTER = True + + def setup(self): self.resumeDownload = False self.multiDL = self.premium -- cgit v1.2.3 From 87203e996fb42c172b15e29f0e394d5b328d9ac2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 23 Dec 2014 13:20:53 +0100 Subject: New plugin: MultiHoster --- module/plugins/hoster/FreeWayMe.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 9c7344f95..b08098915 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo -class FreeWayMe(SimpleHoster): +class FreeWayMe(MultiHoster): __name__ = "FreeWayMe" __type__ = "hoster" - __version__ = "0.12" + __version__ = "0.13" __pattern__ = r'https://(?:www\.)?free-way\.me/.*' @@ -15,9 +15,6 @@ class FreeWayMe(SimpleHoster): __authors__ = [("Nicolas Giese", "james@free-way.me")] - MULTI_HOSTER = True - - def setup(self): self.resumeDownload = False self.multiDL = self.premium -- cgit v1.2.3 From a4786e340993bbfc5d2bf971c9bec18863d3dd80 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 23 Dec 2014 19:29:15 +0100 Subject: [MultiHoster] Update --- module/plugins/hoster/FreeWayMe.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index b08098915..6bda13792 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class FreeWayMe(MultiHoster): __name__ = "FreeWayMe" __type__ = "hoster" - __version__ = "0.13" + __version__ = "0.14" __pattern__ = r'https://(?:www\.)?free-way\.me/.*' @@ -21,7 +21,7 @@ class FreeWayMe(MultiHoster): self.chunkLimit = 1 - def handleMulti(self): + def handlePremium(self): user, data = self.account.selectAccount() self.link = True -- cgit v1.2.3 From cdb06469a640c1875229903a2dbdfa8be469b5bc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 27 Dec 2014 13:52:30 +0100 Subject: Improve a lot of plugin __pattern__ --- module/plugins/hoster/FreeWayMe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 6bda13792..80d0b8515 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -8,7 +8,7 @@ class FreeWayMe(MultiHoster): __type__ = "hoster" __version__ = "0.14" - __pattern__ = r'https://(?:www\.)?free-way\.me/.*' + __pattern__ = r'https://(?:www\.)?free-way\.me/.+' __description__ = """FreeWayMe hoster plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From ea58af3c625d90aec6becfd943289e42e4a71a9a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 2 Jan 2015 02:49:26 +0100 Subject: Code cosmetics --- module/plugins/hoster/FreeWayMe.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 80d0b8515..50131e28e 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -24,11 +24,13 @@ class FreeWayMe(MultiHoster): def handlePremium(self): user, data = self.account.selectAccount() - self.link = True - self.download( - "https://www.free-way.me/load.php", - get={"multiget": 7, "url": self.pyfile.url, "user": user, "pw": self.account.getpw(user), "json": ""}, - disposition=True) + self.download("https://www.free-way.me/load.php", + get={'multiget': 7, + 'url' : self.pyfile.url, + 'user' : user, + 'pw' : self.account.getpw(user), + 'json' : ""}, + disposition=True) getInfo = create_getInfo(FreeWayMe) -- cgit v1.2.3 From fd105f8e51768ec1943cda2375bdfdbe5b0a3951 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 9 Jan 2015 00:35:51 +0100 Subject: "New Year" Update: hoster plugins --- module/plugins/hoster/FreeWayMe.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 50131e28e..ffc8115d3 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -6,11 +6,11 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class FreeWayMe(MultiHoster): __name__ = "FreeWayMe" __type__ = "hoster" - __version__ = "0.14" + __version__ = "0.15" __pattern__ = r'https://(?:www\.)?free-way\.me/.+' - __description__ = """FreeWayMe hoster plugin""" + __description__ = """FreeWayMe multi-hoster plugin""" __license__ = "GPLv3" __authors__ = [("Nicolas Giese", "james@free-way.me")] @@ -21,14 +21,14 @@ class FreeWayMe(MultiHoster): self.chunkLimit = 1 - def handlePremium(self): + def handlePremium(self, pyfile): user, data = self.account.selectAccount() self.download("https://www.free-way.me/load.php", get={'multiget': 7, - 'url' : self.pyfile.url, + 'url' : pyfile.url, 'user' : user, - 'pw' : self.account.getpw(user), + 'pw' : self.account.getAccountData(user)['password'], 'json' : ""}, disposition=True) -- cgit v1.2.3 From b18abd1a3b61bdffc159e87312d527bc71216087 Mon Sep 17 00:00:00 2001 From: flubshi Date: Tue, 13 Jan 2015 23:20:26 +0100 Subject: Host FreeWayMe: Improve error handling, try five times This update allows 4 additional attempts if download fails. --- module/plugins/hoster/FreeWayMe.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index ffc8115d3..6d08e1f8d 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class FreeWayMe(MultiHoster): __name__ = "FreeWayMe" __type__ = "hoster" - __version__ = "0.15" + __version__ = "0.16" __pattern__ = r'https://(?:www\.)?free-way\.me/.+' @@ -24,13 +24,30 @@ class FreeWayMe(MultiHoster): def handlePremium(self, pyfile): user, data = self.account.selectAccount() - self.download("https://www.free-way.me/load.php", + for _i in xrange(5): + # try it five times + header = self.load("https://www.free-way.me/load.php", get={'multiget': 7, 'url' : pyfile.url, 'user' : user, 'pw' : self.account.getAccountData(user)['password'], - 'json' : ""}, - disposition=True) + 'json' : ""}, just_header=True) + if "location" in header: + #download + self.logInfo("Download: " + header['location']) + headers = self.load(header['location'],just_header=True) + if headers['code'] == 500: + #error on 2nd stage + self.logInfo("Free-Way Error [stage2]") + # todo: handle errors + else: + # seems to work.. + self.download(header['location']) + break + else: + #error page first stage + self.logInfo("Free-Way Error [stage1]") + # todo: handle errors getInfo = create_getInfo(FreeWayMe) -- cgit v1.2.3 From f23019b934446275b97f0c5fecf7709c19e557f9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 29 Jan 2015 02:19:37 +0100 Subject: [JustPremium] Cleanup --- module/plugins/hoster/FreeWayMe.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'module/plugins/hoster/FreeWayMe.py') diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 6d08e1f8d..76ffca505 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -27,27 +27,27 @@ class FreeWayMe(MultiHoster): for _i in xrange(5): # try it five times header = self.load("https://www.free-way.me/load.php", - get={'multiget': 7, - 'url' : pyfile.url, - 'user' : user, - 'pw' : self.account.getAccountData(user)['password'], - 'json' : ""}, just_header=True) - if "location" in header: - #download - self.logInfo("Download: " + header['location']) - headers = self.load(header['location'],just_header=True) + get={'multiget': 7, + 'url' : pyfile.url, + 'user' : user, + 'pw' : self.account.getAccountData(user)['password'], + 'json' : ""}, + just_header=True) + + if 'location' in header: + headers = self.load(header['location'], just_header=True) if headers['code'] == 500: - #error on 2nd stage - self.logInfo("Free-Way Error [stage2]") - # todo: handle errors + # error on 2nd stage + self.logError(_("Error [stage2]")) else: # seems to work.. self.download(header['location']) break else: - #error page first stage - self.logInfo("Free-Way Error [stage1]") - # todo: handle errors + # error page first stage + self.logError(_("Error [stage1]")) + + #@TODO: handle errors getInfo = create_getInfo(FreeWayMe) -- cgit v1.2.3