Private GIT

Skip to content
Snippets Groups Projects
Commit 4818de1f authored by Nic Wolfe's avatar Nic Wolfe
Browse files

Refactor Newzbin provider a bit to use the same URL everywhere

parent 0d1c0c7b
Branches
Tags
No related merge requests found
...@@ -189,7 +189,7 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -189,7 +189,7 @@ class NewzbinProvider(generic.NZBProvider):
def getIDFromURL(self, url): def getIDFromURL(self, url):
id_regex = 'https?://www\.newzbin\.com/browse/post/(\d+)/' id_regex = re.escape(self.url) + 'browse/post/(\d+)/'
id_match = re.match(id_regex, url) id_match = re.match(id_regex, url)
if not id_match: if not id_match:
return None return None
...@@ -212,7 +212,7 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -212,7 +212,7 @@ class NewzbinProvider(generic.NZBProvider):
params = urllib.urlencode({"username": sickbeard.NEWZBIN_USERNAME, "password": sickbeard.NEWZBIN_PASSWORD, "reportid": id}) params = urllib.urlencode({"username": sickbeard.NEWZBIN_USERNAME, "password": sickbeard.NEWZBIN_PASSWORD, "reportid": id})
try: try:
urllib.urlretrieve("http://www.newzbin.com/api/dnzb/", fileName, data=params) urllib.urlretrieve(self.url+"api/dnzb/", fileName, data=params)
except exceptions.NewzbinAPIThrottled: except exceptions.NewzbinAPIThrottled:
logger.log("Done waiting for Newzbin API throttle limit, starting downloads again") logger.log("Done waiting for Newzbin API throttle limit, starting downloads again")
self.downloadResult(nzb) self.downloadResult(nzb)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment