From 090c9d2abdac07025fe6d7351e376e85aabc0891 Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 27 Dec 2009 22:16:51 +0100 Subject: fixed uploaded.to and netload.in, gui clipboard check --- module/plugins/hoster/NetloadIn.py | 2 +- module/plugins/hoster/UploadedTo.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index bc755fb58..dc639df45 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -64,7 +64,7 @@ class NetloadIn(Plugin): def download_api_data(self): url = self.parent.url - id_regex = re.compile("http://netload.in/datei(.*?)(?:\.htm|/)") + id_regex = re.compile("http://.*netload.in/datei(.*?)(?:\.htm|/)") match = id_regex.search(url) if match: apiurl = "http://netload.in/share/fileinfos2.php" diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index bb623b4e6..0d487be46 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -84,9 +84,6 @@ class UploadedTo(Plugin): self.api_data["checksum"] = lines[2] #sha1 def download_html(self): - if self.config['premium']: - self.config['username'], self.config['password'] - self.req.load("http://uploaded.to/login", None, { "email" : self.config['username'], "password" : self.config['password']}) url = self.parent.url self.html = self.req.load(url, cookies=False) @@ -131,6 +128,7 @@ class UploadedTo(Plugin): def proceed(self, url, location): if self.config['premium']: + self.req.load("http://uploaded.to/login", None, { "email" : self.config['username'], "password" : self.config['password']}, cookies=True) self.req.download(url, location, cookies=True) else: self.req.download(url, location, cookies=False, post={"download_submit": "Free Download"}) -- cgit v1.2.3