diff options
| author |  Max <max@spiritix.eu>
| 2013-07-22 23:26:20 +0200 |
|---|---|---|
| committer | Max <max@spiritix.eu>
| 2013-07-22 23:26:20 +0200 |
| commit | 1cbdd77c2b17c813163aabf0ef7b8bcae7996dc8 (patch) | |
| tree | 1e8e232c5cb1dc26979dd1744938c531154f1372 /module/plugins | |
| parent | fastix integration 2nd (diff) | |
| download | pyload-1cbdd77c2b17c813163aabf0ef7b8bcae7996dc8.tar.xz | |
fastix integration
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/accounts/Fastix.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/Fastix.py | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/module/plugins/accounts/Fastix.py b/module/plugins/accounts/Fastix.py index c52961843..862815a84 100644 --- a/module/plugins/accounts/Fastix.py +++ b/module/plugins/accounts/Fastix.py @@ -28,9 +28,6 @@ class Fastix(Account): api = json_loads(page)
api = api['apikey']
data["api"] = api
- out_file = open("fastix_api.txt","w")
- out_file.write(api)
- out_file.close()
if "error_code" in page:
self.wrongPassword()
\ No newline at end of file diff --git a/module/plugins/hoster/Fastix.py b/module/plugins/hoster/Fastix.py index 330ce78fc..c16465d92 100644 --- a/module/plugins/hoster/Fastix.py +++ b/module/plugins/hoster/Fastix.py @@ -8,6 +8,7 @@ from module.common.json_layer import json_loads from module.utils import parseFileSize
+
class Fastix(Hoster):
__name__ = "Fastix"
__version__ = "0.02"
@@ -41,9 +42,8 @@ class Fastix(Hoster): if re.match(self.__pattern__, pyfile.url):
new_url = pyfile.url
else:
- in_file = open("fastix_api.txt","r")
- api_key = in_file.read()
- in_file.close()
+ api_key = self.account.getAccountData(self.user)
+ api_key = api_key["api"]
url = "http://fastix.ru/api_v2/?apikey=%s&sub=getdirectlink&link=%s" % (api_key,pyfile.url)
page = self.load(url)
data = json_loads(page)
|