summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/FreeWayMe.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster/FreeWayMe.py')
-rw-r--r--module/plugins/hoster/FreeWayMe.py36
1 files changed, 27 insertions, 9 deletions
diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index ffc8115d3..bb6d9f29d 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -6,9 +6,10 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
class FreeWayMe(MultiHoster):
__name__ = "FreeWayMe"
__type__ = "hoster"
- __version__ = "0.15"
+ __version__ = "0.18"
- __pattern__ = r'https://(?:www\.)?free-way\.me/.+'
+ __pattern__ = r'https?://(?:www\.)?free-way\.(bz|me)/.+'
+ __config__ = [("use_premium", "bool", "Use premium account if available", True)]
__description__ = """FreeWayMe multi-hoster plugin"""
__license__ = "GPLv3"
@@ -24,13 +25,30 @@ class FreeWayMe(MultiHoster):
def handlePremium(self, pyfile):
user, data = self.account.selectAccount()
- self.download("https://www.free-way.me/load.php",
- get={'multiget': 7,
- 'url' : pyfile.url,
- 'user' : user,
- 'pw' : self.account.getAccountData(user)['password'],
- 'json' : ""},
- disposition=True)
+ for _i in xrange(5):
+ # try it five times
+ header = self.load("http://www.free-way.bz/load.php", #@TODO: Revert to `https` in 0.4.10
+ 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.logError(_("Error [stage2]"))
+ else:
+ # seems to work..
+ self.download(header['location'])
+ break
+ else:
+ # error page first stage
+ self.logError(_("Error [stage1]"))
+
+ #@TODO: handle errors
getInfo = create_getInfo(FreeWayMe)