Skip to content

Added fix for correct header content-type for NzbDrone for RSS and API #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RandomUser99 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added fix for correct header content-type for NzbDrone for RSS and API #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94e71a
Added fix for correct header content-type for NzbDrone for RSS and AP…
Oct 1, 2014
17ea4cd
Fixed issue where NzbDrone only parses one result
johrs Oct 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NZBmegasearch/ApiModule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ def cleanUpResultsXML(self, results):

#~ non CP request generate might errors if no url is found in the permalink
if(self.typesearch != 0):
niceResults_row['encodedurl'] = 'http://bogus.gu/bog'
niceResults_row['encodedurl'] = results[i]['url']

niceResults.append( niceResults_row)

Expand Down
8 changes: 4 additions & 4 deletions NZBmegasearch/mega2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ def rss():
if(len(cfgsets.cgen['general_apikey'])):
if('apikey' in request.args):
if(request.args['apikey'] == cfgsets.cgen['general_apikey']):
return apiresp.dosearch_rss(request.args, urlparse(request.url))
return apiresp.dosearch_rss(request.args, urlparse(request.url)), 200, {'Content-Type':'application/rss+xml'}
else:
return '[API key protection ACTIVE] Wrong key selected'
else:
return '[API key protection ACTIVE] API key required'
else:
return apiresp.dosearch_rss(request.args, urlparse(request.url))
return apiresp.dosearch_rss(request.args, urlparse(request.url)), 200, {'Content-Type':'application/rss+xml'}


#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
Expand Down Expand Up @@ -336,13 +336,13 @@ def api():
if(len(cfgsets.cgen['general_apikey'])):
if('apikey' in request.args):
if(request.args['apikey'] == cfgsets.cgen['general_apikey']):
return apiresp.dosearch(request.args, urlparse(request.url))
return apiresp.dosearch(request.args, urlparse(request.url)), 200, {'Content-Type':'application/rss+xml'}
else:
return '[API key protection ACTIVE] Wrong key selected'
else:
return '[API key protection ACTIVE] API key required'
else:
return apiresp.dosearch(request.args, urlparse(request.url))
return apiresp.dosearch(request.args, urlparse(request.url)), 200, {'Content-Type':'application/rss+xml'}

#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~

Expand Down