Adapted 6 multi hoster plugins

13 files changed, 58 insertions, 29 deletions

diff --git a/pyload/plugins/accounts/DebridItaliaCom.py b/pyload/plugins/accounts/DebridItaliaCom.py
index 82acd8f8e..30bfa65f9 100644
--- a/pyload/plugins/accounts/DebridItaliaCom.py
+++ b/pyload/plugins/accounts/DebridItaliaCom.py
@@ -18,10 +18,10 @@
 import re
 import time
 
-from module.plugins.Account import Account
+from pyload.plugins.MultiHoster import MultiHoster
 
 
-class DebridItaliaCom(Account):
+class DebridItaliaCom(MultiHoster):
     __name__ = "DebridItaliaCom"
     __version__ = "0.1"
     __type__ = "account"
@@ -47,3 +47,12 @@ class DebridItaliaCom(Account):
                              get={"u": user, "p": data["password"]})
         if 'NO' in self.html:
             self.wrongPassword()
+
+    def loadHosterList(self, req):
+        return ["netload.in", "hotfile.com", "rapidshare.com", "multiupload.com",
+                "uploading.com", "megashares.com", "crocko.com", "filepost.com",
+                "bitshare.com", "share-links.biz", "putlocker.com", "uploaded.to",
+                "speedload.org", "rapidgator.net", "likeupload.net", "cyberlocker.ch",
+                "depositfiles.com", "extabit.com", "filefactory.com", "sharefiles.co",
+                "ryushare.com", "tusfiles.net", "nowvideo.co", "cloudzer.net", "letitbit.net",
+                "easybytez.com", "uptobox.com", "ddlstorage.com"]
diff --git a/pyload/plugins/accounts/FastixRu.py b/pyload/plugins/accounts/FastixRu.py
index 3e1896e44..34d88dd25 100644
--- a/pyload/plugins/accounts/FastixRu.py
+++ b/pyload/plugins/accounts/FastixRu.py
@@ -1,8 +1,8 @@
-from module.plugins.Account import Account
-from module.common.json_layer import json_loads
+from pyload.plugins.MultiHoster import MultiHoster
+from pyload.utils import json_loads
 
 
-class FastixRu(Account):
+class FastixRu(MultiHoster):
     __name__ = "FastixRu"
     __version__ = "0.02"
     __type__ = "account"
@@ -30,3 +30,10 @@ class FastixRu(Account):
         data["api"] = api
         if "error_code" in page:
             self.wrongPassword()
+
+    def loadHosterList(self, req):
+        page = req.load(
+            "http://fastix.ru/api_v2/?apikey=5182964c3f8f9a7f0b00000a_kelmFB4n1IrnCDYuIFn2y&sub=allowed_sources")
+        host_list = json_loads(page)
+        host_list = host_list['allow']
+        return host_list
diff --git a/pyload/plugins/accounts/MultiDebridCom.py b/pyload/plugins/accounts/MultiDebridCom.py
index 904be5ee7..a98b8abae 100644
--- a/pyload/plugins/accounts/MultiDebridCom.py
+++ b/pyload/plugins/accounts/MultiDebridCom.py
@@ -17,11 +17,11 @@
 
 from time import time
 
-from module.plugins.Account import Account
-from module.common.json_layer import json_loads
+from pyload.plugins.MultiHoster import MultiHoster
+from pyload.utils import json_loads
 
 
-class MultiDebridCom(Account):
+class MultiDebridCom(MultiHoster):
     __name__ = "MultiDebridCom"
     __version__ = "0.01"
     __type__ = "account"
@@ -45,3 +45,10 @@ class MultiDebridCom(Account):
         if self.json_data['status'] != 'ok':
             self.logError('Invalid login. The password to use is the API-Password you find in your "My Account" page')
             self.wrongPassword()
+
+    def loadHosterList(self, req):
+        json_data = req.load('http://multi-debrid.com/api.php?hosts', decode=True)
+        self.logDebug('JSON data: ' + json_data)
+        json_data = json_loads(json_data)
+
+        return json_data['hosts']
diff --git a/pyload/plugins/accounts/MultishareCz.py b/pyload/plugins/accounts/MultishareCz.py
index 273936615..a50ced431 100644
--- a/pyload/plugins/accounts/MultishareCz.py
+++ b/pyload/plugins/accounts/MultishareCz.py
@@ -17,14 +17,14 @@
     @author: zoidberg
 """
 
-from module.plugins.Account import Account
+from pyload.plugins.MultiHoster import MultiHoster
 #from time import mktime, strptime
 #from pycurl import REFERER
 import re
-from module.utils import parseFileSize
+from pyload.utils import parseFileSize
 
 
-class MultishareCz(Account):
+class MultishareCz(MultiHoster):
     __name__ = "MultishareCz"
     __version__ = "0.02"
     __type__ = "account"
@@ -34,6 +34,7 @@ class MultishareCz(Account):
 
     TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[0-9,]+)&nbsp;(?P<U>\w+)</strong>'
     ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">'
+    HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="([^"]+)"></td>\s*<td class="stav">[^>]*?alt="OK"'
 
     def loadAccountInfo(self, user, req):
         #self.relogin(user)
@@ -56,4 +57,8 @@ class MultishareCz(Account):
         }, decode=True)
 
         if '<div class="akce-chyba akce">' in html:
-            self.wrongPassword()
\ No newline at end of file
+            self.wrongPassword()
+
+    def loadHosterList(self, req):
+        page = req.load("http://www.multishare.cz/monitoring/")
+        return re.findall(self.HOSTER_PATTERN, page)
diff --git a/pyload/plugins/accounts/PremiumizeMe.py b/pyload/plugins/accounts/PremiumizeMe.py
index 02faf0e75..8b4569f06 100644
--- a/pyload/plugins/accounts/PremiumizeMe.py
+++ b/pyload/plugins/accounts/PremiumizeMe.py
@@ -40,7 +40,6 @@ class PremiumizeMe(MultiHoster):
             user, self.accounts[user]['password']))
         return json_loads(answer)
 
-
     def loadHosterList(self, req):
         # Get supported hosters list from premiumize.me using the
         # json API v1 (see https://secure.premiumize.me/?show=api)
diff --git a/pyload/plugins/accounts/RealdebridCom.py b/pyload/plugins/accounts/RealdebridCom.py
index 5dda02c85..e47c68d6c 100644
--- a/pyload/plugins/accounts/RealdebridCom.py
+++ b/pyload/plugins/accounts/RealdebridCom.py
@@ -1,6 +1,6 @@
 import xml.dom.minidom as dom
 
-from module.plugins.MultiHoster import MultiHoster
+from pyload.plugins.MultiHoster import MultiHoster
 
 
 class RealdebridCom(MultiHoster):
@@ -28,7 +28,5 @@ class RealdebridCom(MultiHoster):
             self.wrongPassword()
 
     def loadHosterList(self, req):
-        https = "https" if self.getConfig("https") else "http"
-        page = req.load(https + "://real-debrid.com/api/hosters.php").replace("\"","").strip()
-
+        page = req.load("http://real-debrid.com/api/hosters.php").replace("\"", "").strip()
         return[x.strip() for x in page.split(",") if x.strip()]
diff --git a/pyload/plugins/accounts/ZeveraCom.py b/pyload/plugins/accounts/ZeveraCom.py
index 13ed95133..8f05f1d76 100644
--- a/pyload/plugins/accounts/ZeveraCom.py
+++ b/pyload/plugins/accounts/ZeveraCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from time import mktime, strptime
 
-from module.plugins.Account import Account
+from pyload.plugins.MultiHoster import MultiHoster
 
 
-class ZeveraCom(Account):
+class ZeveraCom(MultiHoster):
     __name__ = "ZeveraCom"
     __version__ = "0.21"
     __type__ = "account"
@@ -49,3 +49,7 @@ class ZeveraCom(Account):
                         [x.split(':', 1) for x in response.splitlines() if ':' in x])
         else:
             return response
+
+    def loadHosterList(self, req):
+        page = req.load("http://www.zevera.com/jDownloader.ashx?cmd=gethosters")
+        return [x.strip() for x in page.replace("\"", "").split(",")]
diff --git a/pyload/plugins/hoster/DebridItaliaCom.py b/pyload/plugins/hoster/DebridItaliaCom.py
index 1c2f4246b..8d6a689ea 100644
--- a/pyload/plugins/hoster/DebridItaliaCom.py
+++ b/pyload/plugins/hoster/DebridItaliaCom.py
@@ -17,7 +17,7 @@
 
 import re
 
-from module.plugins.Hoster import Hoster
+from pyload.plugins.Hoster import Hoster
 
 
 class DebridItaliaCom(Hoster):
diff --git a/pyload/plugins/hoster/FastixRu.py b/pyload/plugins/hoster/FastixRu.py
index 4d3e7b93d..c152f2637 100644
--- a/pyload/plugins/hoster/FastixRu.py
+++ b/pyload/plugins/hoster/FastixRu.py
@@ -3,8 +3,8 @@
 import re
 from urllib import unquote
 from random import randrange
-from module.plugins.Hoster import Hoster
-from module.common.json_layer import json_loads
+from pyload.plugins.Hoster import Hoster
+from pyload.utils import json_loads
 
 
 class FastixRu(Hoster):
diff --git a/pyload/plugins/hoster/MultiDebridCom.py b/pyload/plugins/hoster/MultiDebridCom.py
index 7280504cb..7003057e3 100644
--- a/pyload/plugins/hoster/MultiDebridCom.py
+++ b/pyload/plugins/hoster/MultiDebridCom.py
@@ -17,8 +17,8 @@
 
 import re
 
-from module.plugins.Hoster import Hoster
-from module.common.json_layer import json_loads
+from pyload.plugins.Hoster import Hoster
+from pyload.utils import json_loads
 
 
 class MultiDebridCom(Hoster):
diff --git a/pyload/plugins/hoster/MultishareCz.py b/pyload/plugins/hoster/MultishareCz.py
index d4f6c41b4..a4fe19712 100644
--- a/pyload/plugins/hoster/MultishareCz.py
+++ b/pyload/plugins/hoster/MultishareCz.py
@@ -18,7 +18,7 @@
 
 import re
 from random import random
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class MultishareCz(SimpleHoster):
diff --git a/pyload/plugins/hoster/RealdebridCom.py b/pyload/plugins/hoster/RealdebridCom.py
index fd91b89b7..f0752553d 100644
--- a/pyload/plugins/hoster/RealdebridCom.py
+++ b/pyload/plugins/hoster/RealdebridCom.py
@@ -6,9 +6,9 @@ from time import time
 from urllib import quote, unquote
 from random import randrange
 
-from module.utils import parseFileSize
-from module.common.json_layer import json_loads
-from module.plugins.Hoster import Hoster
+from pyload.utils import parseFileSize
+from pyload.utils import json_loads
+from pyload.plugins.Hoster import Hoster
 
 
 class RealdebridCom(Hoster):
diff --git a/pyload/plugins/hoster/ZeveraCom.py b/pyload/plugins/hoster/ZeveraCom.py
index e8b832a13..93d91cba2 100644
--- a/pyload/plugins/hoster/ZeveraCom.py
+++ b/pyload/plugins/hoster/ZeveraCom.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from module.plugins.Hoster import Hoster
+from pyload.plugins.Hoster import Hoster
 
 
 class ZeveraCom(Hoster):