From c5448ab655480a39cb671f8dc683e44bb6d6f977 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Fri, 8 Jun 2012 07:53:19 +0200 Subject: [PATCH] Implement new return object format for files --- resolv/resolvers/mediafire.py | 8 +++++++- resolv/resolvers/pastebin.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/resolv/resolvers/mediafire.py b/resolv/resolvers/mediafire.py index 0b5456d..1e3641a 100644 --- a/resolv/resolvers/mediafire.py +++ b/resolv/resolvers/mediafire.py @@ -19,4 +19,10 @@ def resolve(url): except: raise ResolverError("Could not find the download title.") - return { 'title': file_title, 'files': { 'file': file_url } } + file_dict = { + 'url' : file_url, + 'priority' : 1, + 'format' : "unknown" + } + + return { 'title': file_title, 'files': [file_dict] } diff --git a/resolv/resolvers/pastebin.py b/resolv/resolvers/pastebin.py index f4e61c3..4f2089f 100644 --- a/resolv/resolvers/pastebin.py +++ b/resolv/resolvers/pastebin.py @@ -21,4 +21,10 @@ def resolve(url): paste_title = unescape(matches.group(1)) - return { 'title': paste_title, 'files': { 'file': "http://pastebin.com/download.php?i=%s" % paste_id } } + file_dict = { + 'url' : "http://pastebin.com/download.php?i=%s" % paste_id, + 'priority' : 1, + 'format' : "text" + } + + return { 'title': paste_title, 'files': [file_dict] }