diff options
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r-- | module/plugins/hoster/AlldebridCom.py | 6 | ||||
-rw-r--r-- | module/plugins/hoster/BitshareCom.py | 8 | ||||
-rw-r--r-- | module/plugins/hoster/FileshareInUa.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/FreakshareCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/GamefrontCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/NetloadIn.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/OverLoadMe.py | 6 | ||||
-rw-r--r-- | module/plugins/hoster/PremiumizeMe.py | 8 | ||||
-rw-r--r-- | module/plugins/hoster/RPNetBiz.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/RapidshareCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/RealdebridCom.py | 6 | ||||
-rw-r--r-- | module/plugins/hoster/ReloadCc.py | 10 | ||||
-rw-r--r-- | module/plugins/hoster/UploadedTo.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/UploadingCom.py | 4 | ||||
-rw-r--r-- | module/plugins/hoster/XHamsterCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/YoupornCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/ZeveraCom.py | 4 |
17 files changed, 35 insertions, 35 deletions
diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index b094c805b..a3386ea02 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -55,9 +55,9 @@ class AlldebridCom(Hoster): self.logWarning(data["error"]) self.tempOffline() else: - if self.pyfile.name and not self.pyfile.name.endswith('.tmp'): - self.pyfile.name = data["filename"] - self.pyfile.size = parseFileSize(data["filesize"]) + if pyfile.name and not pyfile.name.endswith('.tmp'): + pyfile.name = data["filename"] + pyfile.size = parseFileSize(data["filesize"]) new_url = data["link"] if self.getConfig("https"): diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index 82a1dcfab..6c9d3a6ef 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -36,12 +36,12 @@ class BitshareCom(SimpleHoster): self.pyfile = pyfile # File id - m = re.match(self.__pattern__, self.pyfile.url) + m = re.match(self.__pattern__, pyfile.url) self.file_id = max(m.group('id1'), m.group('id2')) self.logDebug("File id is [%s]" % self.file_id) # Load main page - self.html = self.load(self.pyfile.url, ref=False, decode=True) + self.html = self.load(pyfile.url, ref=False, decode=True) # Check offline if re.search(self.FILE_OFFLINE_PATTERN, self.html): @@ -55,11 +55,11 @@ class BitshareCom(SimpleHoster): self.retry() # File name - m = re.match(self.__pattern__, self.pyfile.url) + m = re.match(self.__pattern__, pyfile.url) name1 = m.group('name') if m else None m = re.search(self.FILE_INFO_PATTERN, self.html) name2 = m.group('N') if m else None - self.pyfile.name = max(name1, name2) + pyfile.name = max(name1, name2) # Ajax file id self.ajaxid = re.search(self.FILE_AJAXID_PATTERN, self.html).group(1) diff --git a/module/plugins/hoster/FileshareInUa.py b/module/plugins/hoster/FileshareInUa.py index 95068e66b..48113ca95 100644 --- a/module/plugins/hoster/FileshareInUa.py +++ b/module/plugins/hoster/FileshareInUa.py @@ -29,7 +29,7 @@ class FileshareInUa(Hoster): if not self._checkOnline(): self.offline() - self.pyfile.name = self._getName() + pyfile.name = self._getName() self.link = self._getLink() diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py index 86e48e849..005f06a90 100644 --- a/module/plugins/hoster/FreakshareCom.py +++ b/module/plugins/hoster/FreakshareCom.py @@ -32,7 +32,7 @@ class FreakshareCom(Hoster): self.prepare() self.get_file_url() - self.download(self.pyfile.url, post=self.req_opts) + self.download(pyfile.url, post=self.req_opts) check = self.checkDownload({"bad": "bad try", "paralell": "> Sorry, you cant download more then 1 files at time. <", diff --git a/module/plugins/hoster/GamefrontCom.py b/module/plugins/hoster/GamefrontCom.py index e130ca5c0..18908b5f7 100644 --- a/module/plugins/hoster/GamefrontCom.py +++ b/module/plugins/hoster/GamefrontCom.py @@ -30,7 +30,7 @@ class GamefrontCom(Hoster): if not self._checkOnline(): self.offline() - self.pyfile.name = self._getName() + pyfile.name = self._getName() self.link = self._getLink() diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 2f75e5ac0..df3a27bb7 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -63,7 +63,7 @@ class NetloadIn(Hoster): def process(self, pyfile): self.url = pyfile.url self.prepare() - self.pyfile.setStatus("downloading") + pyfile.setStatus("downloading") self.proceed(self.url) def prepare(self): diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index 33c041973..5edbb2c57 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -51,9 +51,9 @@ class OverLoadMe(Hoster): self.logWarning(data["msg"]) self.tempOffline() else: - if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data["filename"]: - self.pyfile.name = data["filename"] - self.pyfile.size = parseFileSize(data["filesize"]) + if pyfile.name is not None and pyfile.name.endswith('.tmp') and data["filename"]: + pyfile.name = data["filename"] + pyfile.size = parseFileSize(data["filesize"]) new_url = data["downloadlink"] if self.getConfig("https"): diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py index 79b6e3fad..7e646fdf9 100644 --- a/module/plugins/hoster/PremiumizeMe.py +++ b/module/plugins/hoster/PremiumizeMe.py @@ -26,13 +26,13 @@ class PremiumizeMe(Hoster): # In some cases hostsers do not supply us with a filename at download, so we # are going to set a fall back filename (e.g. for freakshare or xfileshare) - self.pyfile.name = self.pyfile.name.split('/').pop() # Remove everthing before last slash + pyfile.name = pyfile.name.split('/').pop() # Remove everthing before last slash # Correction for automatic assigned filename: Removing html at end if needed suffix_to_remove = ["html", "htm", "php", "php3", "asp", "shtm", "shtml", "cfml", "cfm"] - temp = self.pyfile.name.split('.') + temp = pyfile.name.split('.') if temp.pop() in suffix_to_remove: - self.pyfile.name = ".".join(temp) + pyfile.name = ".".join(temp) # Get account data (user, data) = self.account.selectAccount() @@ -40,7 +40,7 @@ class PremiumizeMe(Hoster): # Get rewritten link using the premiumize.me api v1 (see https://secure.premiumize.me/?show=api) answer = self.load( "https://api.premiumize.me/pm-api/v1.php?method=directdownloadlink¶ms[login]=%s¶ms[pass]=%s¶ms[link]=%s" % ( - user, data['password'], self.pyfile.url)) + user, data['password'], pyfile.url)) data = json_loads(answer) # Check status and decide what to do diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py index 38045b452..380f84c53 100644 --- a/module/plugins/hoster/RPNetBiz.py +++ b/module/plugins/hoster/RPNetBiz.py @@ -34,7 +34,7 @@ class RPNetBiz(Hoster): # Get the download link response = self.load("https://premium.rpnet.biz/client_api.php", get={"username": user, "password": data['password'], - "action": "generate", "links": self.pyfile.url}) + "action": "generate", "links": pyfile.url}) self.logDebug("JSON data: %s" % response) link_status = json_loads(response)['links'][0] # get the first link... since we only queried one diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py index 8ecea6886..47e3653cc 100644 --- a/module/plugins/hoster/RapidshareCom.py +++ b/module/plugins/hoster/RapidshareCom.py @@ -73,7 +73,7 @@ class RapidshareCom(Hoster): self.multiDL = self.resumeDownload = self.premium def process(self, pyfile): - self.url = self.pyfile.url + self.url = pyfile.url self.prepare() def prepare(self): diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index fc863863e..04ba80d0f 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -61,9 +61,9 @@ class RealdebridCom(Hoster): self.logWarning(data["message"]) self.tempOffline() else: - if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data["file_name"]: - self.pyfile.name = data["file_name"] - self.pyfile.size = parseFileSize(data["file_size"]) + if pyfile.name is not None and pyfile.name.endswith('.tmp') and data["file_name"]: + pyfile.name = data["file_name"] + pyfile.size = parseFileSize(data["file_size"]) new_url = data['generated_links'][0][-1] if self.getConfig("https"): diff --git a/module/plugins/hoster/ReloadCc.py b/module/plugins/hoster/ReloadCc.py index 5ad525b78..ed1b21aa3 100644 --- a/module/plugins/hoster/ReloadCc.py +++ b/module/plugins/hoster/ReloadCc.py @@ -28,13 +28,13 @@ class ReloadCc(Hoster): # In some cases hostsers do not supply us with a filename at download, so we # are going to set a fall back filename (e.g. for freakshare or xfileshare) - self.pyfile.name = self.pyfile.name.split('/').pop() # Remove everthing before last slash + pyfile.name = pyfile.name.split('/').pop() # Remove everthing before last slash # Correction for automatic assigned filename: Removing html at end if needed suffix_to_remove = ["html", "htm", "php", "php3", "asp", "shtm", "shtml", "cfml", "cfm"] - temp = self.pyfile.name.split('.') + temp = pyfile.name.split('.') if temp.pop() in suffix_to_remove: - self.pyfile.name = ".".join(temp) + pyfile.name = ".".join(temp) # Get account data (user, data) = self.account.selectAccount() @@ -43,7 +43,7 @@ class ReloadCc(Hoster): via='pyload', v=1, user=user, - uri=self.pyfile.url + uri=pyfile.url ) try: @@ -63,7 +63,7 @@ class ReloadCc(Hoster): elif e.code == 403: self.fail("Your account is disabled. Please contact the Reload.cc support!") elif e.code == 409: - self.logWarning("The hoster seems to be a limited hoster and you've used your daily traffic for this hoster: %s" % self.pyfile.url) + self.logWarning("The hoster seems to be a limited hoster and you've used your daily traffic for this hoster: %s" % pyfile.url) # Wait for 6 hours and retry up to 4 times => one day self.retry(4, 6 * 60 * 60, "Limited hoster traffic limit exceeded") elif e.code == 429: diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 6e6f0aeaf..2ab7d89b6 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -138,7 +138,7 @@ class UploadedTo(Hoster): pyfile.name = html_unescape(self.data[2]) - # self.pyfile.name = self.get_file_name() + # pyfile.name = self.get_file_name() if self.premium: self.handlePremium() diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py index 9bb526506..c6a8a1231 100644 --- a/module/plugins/hoster/UploadingCom.py +++ b/module/plugins/hoster/UploadingCom.py @@ -44,8 +44,8 @@ class UploadingCom(SimpleHoster): self.req.cj.setCookie("uploading.com", "setlang", "en") self.req.cj.setCookie("uploading.com", "_lang", "en") - if not "/get/" in self.pyfile.url: - self.pyfile.url = self.pyfile.url.replace("/files", "/files/get") + if not "/get/" in pyfile.url: + pyfile.url = pyfile.url.replace("/files", "/files/get") self.html = self.load(pyfile.url, decode=True) self.file_info = self.getFileInfo() diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 7d33909f7..254707faf 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -32,7 +32,7 @@ class XHamsterCom(Hoster): if self.getConfig("type"): self.desired_fmt = self.getConfig("type") - self.pyfile.name = self.get_file_name() + self.desired_fmt + pyfile.name = self.get_file_name() + self.desired_fmt self.download(self.get_file_url()) def download_html(self): diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py index 65968ba13..c6f2d07ad 100644 --- a/module/plugins/hoster/YoupornCom.py +++ b/module/plugins/hoster/YoupornCom.py @@ -19,7 +19,7 @@ class YoupornCom(Hoster): if not self.file_exists(): self.offline() - self.pyfile.name = self.get_file_name() + pyfile.name = self.get_file_name() self.download(self.get_file_url()) def download_html(self): diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index f910852c8..7305ad90b 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -48,7 +48,7 @@ class ZeveraCom(Hoster): # self.logDebug("zevera.com: Old URL: %s" % pyfile.url) # # last_size = retries = 0 - # olink = self.pyfile.url #quote(self.pyfile.url.encode('utf_8')) + # olink = pyfile.url #quote(pyfile.url.encode('utf_8')) # # for _ in xrange(100): # self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_request', olink = olink) @@ -95,7 +95,7 @@ class ZeveraCom(Hoster): # self.logError(retData['ErrorCode'], retData['ErrorMessage']) # #self.fail('ERROR: ' + retData['ErrorMessage']) # - # if self.pyfile.size / 1024000 > retData['AccountInfo']['AvailableTODAYTrafficForUseInMBytes']: + # if pyfile.size / 1024000 > retData['AccountInfo']['AvailableTODAYTrafficForUseInMBytes']: # self.logWarning("Not enough data left to download the file") # # def crazyDecode(self, ustring): |