diff --git a/resolv/resolvers/dummy.py b/resolv/resolvers/dummy.py index 152a78c..7adb959 100644 --- a/resolv/resolvers/dummy.py +++ b/resolv/resolvers/dummy.py @@ -3,6 +3,10 @@ from resolv.shared import Task class DummyTask(Task): result_type = "dummy" + name = "Dummy Resolver" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + def run(self): self.results = {'dummy': self.url} self.state = "finished" diff --git a/resolv/resolvers/filebox.py b/resolv/resolvers/filebox.py index cc6c27a..4400e5a 100644 --- a/resolv/resolvers/filebox.py +++ b/resolv/resolvers/filebox.py @@ -4,6 +4,10 @@ from resolv.shared import ResolverError, Task class FileboxTask(Task): result_type = "video" + name = "Filebox.com" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + def run(self): matches = re.search("https?:\/\/(www\.)?filebox\.com\/([a-zA-Z0-9]+)", self.url) @@ -29,6 +33,7 @@ class FileboxTask(Task): stream_dict = { 'url' : video_file, + 'method' : "GET", 'quality' : "unknown", 'priority' : 1, 'format' : "unknown" diff --git a/resolv/resolvers/mediafire.py b/resolv/resolvers/mediafire.py index 228c32d..bc5f405 100644 --- a/resolv/resolvers/mediafire.py +++ b/resolv/resolvers/mediafire.py @@ -4,6 +4,10 @@ from resolv.shared import ResolverError, unescape, Task class MediafireTask(Task): result_type = "file" + name = "MediaFire" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + def run(self): try: contents = self.fetch_page(self.url) @@ -45,6 +49,7 @@ class MediafireTask(Task): file_dict = { 'url' : file_url, + 'method' : "GET", 'priority' : 1, 'format' : "unknown" } diff --git a/resolv/resolvers/onechannel.py b/resolv/resolvers/onechannel.py index 068096e..ad9f5ad 100644 --- a/resolv/resolvers/onechannel.py +++ b/resolv/resolvers/onechannel.py @@ -4,6 +4,10 @@ from resolv.shared import ResolverError, Task class OneChannelTask(Task): result_type = "url" + name = "1channel" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + def run(self): matches = re.search("https?:\/\/(www\.)?1channel\.ch\/external\.php\?.*url=([^&]+)", self.url) diff --git a/resolv/resolvers/pastebin.py b/resolv/resolvers/pastebin.py index 061b24b..02a5a22 100644 --- a/resolv/resolvers/pastebin.py +++ b/resolv/resolvers/pastebin.py @@ -4,6 +4,10 @@ from resolv.shared import ResolverError, unescape, Task class PastebinTask(Task): result_type = "text" + name = "Pastebin" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + def run(self): matches = re.search("https?:\/\/(www\.)?pastebin\.com\/([a-zA-Z0-9]+)", self.url) @@ -29,6 +33,7 @@ class PastebinTask(Task): resolved = { 'url' : "http://pastebin.com/download.php?i=%s" % paste_id, + 'method' : "GET", 'priority' : 1, 'format' : "text" } diff --git a/resolv/resolvers/putlocker.py b/resolv/resolvers/putlocker.py index dc75ce7..96e8058 100644 --- a/resolv/resolvers/putlocker.py +++ b/resolv/resolvers/putlocker.py @@ -4,6 +4,10 @@ from resolv.shared import ResolverError, unescape, Task class PutlockerTask(Task): result_type = "video" + name = "PutLocker" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + def run(self): try: import mechanize @@ -64,6 +68,7 @@ class PutlockerTask(Task): stream_dict = { 'url' : video_file, + 'method' : "GET", 'quality' : "unknown", 'priority' : 1, 'format' : "unknown" diff --git a/resolv/resolvers/sockshare.py b/resolv/resolvers/sockshare.py index a13fca6..3e34866 100644 --- a/resolv/resolvers/sockshare.py +++ b/resolv/resolvers/sockshare.py @@ -4,6 +4,10 @@ from resolv.shared import ResolverError, unescape, Task class SockshareTask(Task): result_type = "video" + name = "SockShare" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + def run(self): try: import mechanize @@ -64,6 +68,7 @@ class SockshareTask(Task): stream_dict = { 'url' : video_file, + 'method' : "GET", 'quality' : "unknown", 'priority' : 1, 'format' : "unknown" diff --git a/resolv/resolvers/youtube.py b/resolv/resolvers/youtube.py index 8f766b2..a1cde41 100644 --- a/resolv/resolvers/youtube.py +++ b/resolv/resolvers/youtube.py @@ -4,6 +4,10 @@ from resolv.shared import ResolverError, unescape, Task class YoutubeTask(Task): result_type = "video" + name = "YouTube" + author = "Sven Slootweg" + author_url = "http://cryto.net/~joepie91" + extra_headers = { 'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',