From 7b8c458cca7d21a029620f98e453f746fce69cd1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 16:10:01 +0200 Subject: Prefer single quote for dict key name --- module/plugins/hoster/DdlstorageCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/DdlstorageCom.py') diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py index eed53b1e1..9122b094a 100644 --- a/module/plugins/hoster/DdlstorageCom.py +++ b/module/plugins/hoster/DdlstorageCom.py @@ -61,7 +61,7 @@ class DdlstorageCom(XFileSharingPro): data = {'client_id': 53472, 'file_code': file_id} if self.user: - passwd = self.account.getAccountData(self.user)["password"] + passwd = self.account.getAccountData(self.user)['password'] data['req_type'] = 'file_info_reg' data['user_login'] = self.user data['user_password'] = md5(passwd).hexdigest() -- cgit v1.2.3 From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 Aug 2014 19:35:59 +0200 Subject: Remove trailing whitespaces + remove license headers + import urllib methods directly + sort and fix key attributes + use save_join instead join + sort some import declarations + other minor code cosmetics --- module/plugins/hoster/DdlstorageCom.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/DdlstorageCom.py') diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py index 9122b094a..46255aaad 100644 --- a/module/plugins/hoster/DdlstorageCom.py +++ b/module/plugins/hoster/DdlstorageCom.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- import re + from hashlib import md5 -from module.plugins.hoster.XFileSharingPro import XFileSharingPro +from module.common.json_layer import json_loads from module.network.RequestFactory import getURL from module.plugins.Plugin import chunks -from module.common.json_layer import json_loads +from module.plugins.hoster.XFileSharingPro import XFileSharingPro def getInfo(urls): @@ -42,8 +43,10 @@ def getInfo(urls): class DdlstorageCom(XFileSharingPro): __name__ = "DdlstorageCom" __type__ = "hoster" - __pattern__ = r'http://(?:www\.)?ddlstorage.com/(?P\w{12})' __version__ = "1.01" + + __pattern__ = r'http://(?:www\.)?ddlstorage.com/(?P\w{12})' + __description__ = """DDLStorage.com hoster plugin""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -52,6 +55,7 @@ class DdlstorageCom(XFileSharingPro): FILE_INFO_PATTERN = r'

]*>(?P.+) \((?P[^)]+)\)

' + def prepare(self): self.getAPIData() super(DdlstorageCom, self).prepare() -- cgit v1.2.3 From f4774041abbd32bca0cdece1c100b7c50c77a68c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 10 Aug 2014 21:20:35 +0200 Subject: [DdlstorageCom] Mark dead --- module/plugins/hoster/DdlstorageCom.py | 85 ++-------------------------------- 1 file changed, 5 insertions(+), 80 deletions(-) (limited to 'module/plugins/hoster/DdlstorageCom.py') diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py index 46255aaad..4d77289d7 100644 --- a/module/plugins/hoster/DdlstorageCom.py +++ b/module/plugins/hoster/DdlstorageCom.py @@ -1,93 +1,18 @@ # -*- coding: utf-8 -*- -import re +from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo -from hashlib import md5 -from module.common.json_layer import json_loads -from module.network.RequestFactory import getURL -from module.plugins.Plugin import chunks -from module.plugins.hoster.XFileSharingPro import XFileSharingPro - - -def getInfo(urls): - # DDLStorage API Documentation: - # http://www.ddlstorage.com/cgi-bin/api_req.cgi?req_type=doc - ids = dict() - for url in urls: - m = re.search(DdlstorageCom.__pattern__, url) - ids[m.group('ID')] = url - - for chunk in chunks(ids.keys(), 5): - for _ in xrange(5): - api = getURL('http://www.ddlstorage.com/cgi-bin/api_req.cgi', - post={'req_type': 'file_info_free', - 'client_id': 53472, - 'file_code': ','.join(chunk), - 'sign': md5('file_info_free%d%s%s' % (53472, ','.join(chunk), - '25JcpU2dPOKg8E2OEoRqMSRu068r0Cv3')).hexdigest()}) - api = api.replace('
', '').replace('
', '') - api = json_loads(api) - if 'error' not in api: - break - - result = list() - for el in api: - if el['status'] == 'online': - result.append((el['file_name'], int(el['file_size']), 2, ids[el['file_code']])) - else: - result.append((ids[el['file_code']], 0, 1, ids[el['file_code']])) - yield result - - -class DdlstorageCom(XFileSharingPro): +class DdlstorageCom(DeadHoster): __name__ = "DdlstorageCom" __type__ = "hoster" - __version__ = "1.01" + __version__ = "1.02" - __pattern__ = r'http://(?:www\.)?ddlstorage.com/(?P\w{12})' + __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/\w+' __description__ = """DDLStorage.com hoster plugin""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") - HOSTER_NAME = "ddlstorage.com" - - FILE_INFO_PATTERN = r'

]*>(?P.+) \((?P[^)]+)\)

' - - - def prepare(self): - self.getAPIData() - super(DdlstorageCom, self).prepare() - - def getAPIData(self): - file_id = re.match(self.__pattern__, self.pyfile.url).group('ID') - data = {'client_id': 53472, - 'file_code': file_id} - if self.user: - passwd = self.account.getAccountData(self.user)['password'] - data['req_type'] = 'file_info_reg' - data['user_login'] = self.user - data['user_password'] = md5(passwd).hexdigest() - data['sign'] = md5('file_info_reg%d%s%s%s%s' % (data['client_id'], data['user_login'], - data['user_password'], data['file_code'], - '25JcpU2dPOKg8E2OEoRqMSRu068r0Cv3')).hexdigest() - else: - data['req_type'] = 'file_info_free' - data['sign'] = md5('file_info_free%d%s%s' % (data['client_id'], data['file_code'], - '25JcpU2dPOKg8E2OEoRqMSRu068r0Cv3')).hexdigest() - - self.api_data = self.load('http://www.ddlstorage.com/cgi-bin/api_req.cgi', post=data) - self.api_data = self.api_data.replace('
', '').replace('
', '') - self.logDebug('API Data: ' + self.api_data) - self.api_data = json_loads(self.api_data)[0] - - if self.api_data['status'] == 'offline': - self.offline() - if 'file_name' in self.api_data: - self.pyfile.name = self.api_data['file_name'] - if 'file_size' in self.api_data: - self.pyfile.size = self.api_data['size'] = self.api_data['file_size'] - if 'file_md5_base64' in self.api_data: - self.api_data['md5_ddlstorage'] = self.api_data['file_md5_base64'] +getInfo = create_getInfo(DdlstorageCom) -- cgit v1.2.3