diff options
| author |  spoob <spoob@gmx.de>
| 2009-07-03 15:14:14 +0200 |
|---|---|---|
| committer | spoob <spoob@gmx.de>
| 2009-07-03 15:14:14 +0200 |
| commit | e7b328fb5afdfa0d7e51fdf0cd9797c9a6c3a3d6 (patch) | |
| tree | e00aaf88cfe6933d951c61ce713a1ab04a2565b9 | |
| parent | cleaned up the share-online plugin (diff) | |
| download | pyload-e7b328fb5afdfa0d7e51fdf0cd9797c9a6c3a3d6.tar.xz | |
rapidshare server selection, ul.to links works
| -rw-r--r-- | Plugins/RapidshareCom.py | 5 | ||||
| -rw-r--r-- | Plugins/UploadedTo.py | 2 | ||||
| -rw-r--r-- | module/file_list.py | 12 | ||||
| -rw-r--r-- | pluginconfig | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/Plugins/RapidshareCom.py b/Plugins/RapidshareCom.py index 35555eeb1..bbbcbebd1 100644 --- a/Plugins/RapidshareCom.py +++ b/Plugins/RapidshareCom.py @@ -132,7 +132,10 @@ class RapidshareCom(Plugin): self.download_serverhtml() if not self.want_reconnect: - file_url_pattern = r".*name=\"dlf\" action=\"(.*)\" method=.*" + if self.config['server'] == "": + file_url_pattern = r".*name=\"dlf\" action=\"(.*)\" method=.*" + else: + file_url_pattern = '(http://rs.*)\';" /> %s<br />' % self.config['server'] return re.search(file_url_pattern, self.html[1]).group(1) else: print self.html[1] #test print diff --git a/Plugins/UploadedTo.py b/Plugins/UploadedTo.py index f1e7d8ae3..7f30a0519 100644 --- a/Plugins/UploadedTo.py +++ b/Plugins/UploadedTo.py @@ -12,7 +12,7 @@ class UploadedTo(Plugin): props = {} props['name'] = "UploadedTo" props['type'] = "hoster" - props['pattern'] = r"http://(www\.)?uploaded.to/" + props['pattern'] = r"http://(?:www\.)?u(?:p)?l(?:oaded)?\.to/" props['version'] = "0.1" props['description'] = """Uploaded.to Download Plugin""" props['author_name'] = ("spoob") diff --git a/module/file_list.py b/module/file_list.py index a25e954a5..3a4e531d7 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -56,12 +56,14 @@ class File_List(object): self.append(url) def remove(self, pyfile): - - if pyfile in self.files: - self.files.remove(pyfile) - self.data['order'].remove(pyfile.id) - del self.data[pyfile.id] + pass + + #if pyfile in self.files: + #self.files.remove(pyfile) +# + #self.data['order'].remove(pyfile.id) + #del self.data[pyfile.id] def remove_id(self, pyid): #also abort download diff --git a/pluginconfig b/pluginconfig index 2f4d7d35f..83ce6e07d 100644 --- a/pluginconfig +++ b/pluginconfig @@ -1,4 +1,6 @@ [RapidshareCom] +#select server, empty for automatic, else Cogent, Deutsche Telekom, Level(3), Level(3) #2, GlobalCrossing, Level(3) #3, Teleglobe, GlobalCrossing #2, TeliaSonera #2, Teleglobe #2, TeliaSonera #3, TeliaSonera +server = "" premium = False username = name password = pw |