1 files changed, 43 insertions, 37 deletions
diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index ef07ebaff..6d08e1f8d 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -1,47 +1,53 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
+from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-"""
+class FreeWayMe(MultiHoster):
+    __name__    = "FreeWayMe"
+    __type__    = "hoster"
+    __version__ = "0.16"
 
-from module.plugins.Hoster import Hoster
+    __pattern__ = r'https://(?:www\.)?free-way\.me/.+'
 
+    __description__ = """FreeWayMe multi-hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Nicolas Giese", "james@free-way.me")]
 
-class FreeWayMe(Hoster):
-    __name__ = "FreeWayMe"
-    __version__ = "0.11"
-    __type__ = "hoster"
-    __pattern__ = r'https://(?:www\.)?free-way.me/.*'
-    __description__ = """FreeWayMe hoster plugin"""
-    __author_name__ = "Nicolas Giese"
-    __author_mail__ = "james@free-way.me"
 
     def setup(self):
         self.resumeDownload = False
-        self.chunkLimit = 1
-        self.multiDL = self.premium
-
-    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()
-
-        self.download(
-            "https://www.free-way.me/load.php",
-            get={"multiget": 7, "url": pyfile.url, "user": user, "pw": self.account.getpw(user), "json": ""},
-            disposition=True)
+        self.multiDL        = self.premium
+        self.chunkLimit     = 1
+
+
+    def handlePremium(self, pyfile):
+        user, data = self.account.selectAccount()
+
+        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)
+                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)