diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html index 5e7aa91a..44d50e09 100644 --- a/data/interfaces/brink/config.html +++ b/data/interfaces/brink/config.html @@ -250,7 +250,7 @@ -
Usually http://localhost:9092 +
Usually http://localhost:6789 diff --git a/data/interfaces/classic/config.html b/data/interfaces/classic/config.html index 0af437c5..eb024f5c 100644 --- a/data/interfaces/classic/config.html +++ b/data/interfaces/classic/config.html @@ -130,7 +130,7 @@

NZBget Host:


- usually http://localhost:9092 + usually http://localhost:6789 diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 7d219c5e..0979904d 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -145,7 +145,7 @@
- usually http://localhost:9092 + usually http://localhost:6789
diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html index d03a6a5e..7f78d03e 100644 --- a/data/interfaces/remix/config.html +++ b/data/interfaces/remix/config.html @@ -130,7 +130,7 @@

NZBget Host:


- usually http://localhost:9092 + usually http://localhost:6789 diff --git a/headphones/__init__.py b/headphones/__init__.py index d14e0232..3dce3f57 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -13,6 +13,8 @@ # You should have received a copy of the GNU General Public License # along with Headphones. If not, see . +# NZBGet support added by CurlyMo as a part of XBian - XBMC on the Raspberry Pi + from __future__ import with_statement import os, sys, subprocess @@ -413,7 +415,7 @@ def initialize(): SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '') SAB_CATEGORY = check_setting_str(CFG, 'SABnzbd', 'sab_category', '') - NZBGET_USERNAME = check_setting_str(CFG, 'NZBget', 'nzbget_username', '') + NZBGET_USERNAME = check_setting_str(CFG, 'NZBget', 'nzbget_username', 'nzbget') NZBGET_PASSWORD = check_setting_str(CFG, 'NZBget', 'nzbget_password', '') NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', '') NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '') diff --git a/headphones/nzbget.py b/headphones/nzbget.py index cd0c3315..5176c9f3 100644 --- a/headphones/nzbget.py +++ b/headphones/nzbget.py @@ -1,21 +1,22 @@ -# This file is part of Headphones. -# -# Headphones is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Headphones is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Headphones. If not, see . +# This file is modified to work with headphones by CurlyMo as a part of XBian - XBMC on the Raspberry Pi -##################################### -## Stolen from Sick-Beard's nzbget.py ## -##################################### +# Author: Nic Wolfe +# URL: http://code.google.com/p/sickbeard/ +# +# This file is part of Sick Beard. +# +# Sick Beard is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Sick Beard is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Sick Beard. If not, see . diff --git a/headphones/searcher.py b/headphones/searcher.py index 041cb30b..100c485b 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -13,6 +13,8 @@ # You should have received a copy of the GNU General Public License # along with Headphones. If not, see . +# NZBGet support added by CurlyMo as a part of XBian - XBMC on the Raspberry Pi + import urllib, urllib2, urlparse, httplib import lib.feedparser as feedparser from lib.pygazelle import api as gazelleapi diff --git a/headphones/webserve.py b/headphones/webserve.py index 9e732e6b..66ff59e1 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -13,6 +13,8 @@ # You should have received a copy of the GNU General Public License # along with Headphones. If not, see . +# NZBGet support added by CurlyMo as a part of XBian - XBMC on the Raspberry Pi + import os import cherrypy @@ -706,7 +708,7 @@ class WebInterface(object): def configUpdate(self, http_host='0.0.0.0', http_username=None, http_port=8181, http_password=None, launch_browser=0, api_enabled=0, api_key=None, download_scan_interval=None, nzb_search_interval=None, libraryscan_interval=None, sab_host=None, sab_username=None, sab_apikey=None, sab_password=None, - sab_category=None, nzbget_host=None, nzbget_username=None, nzbget_password=None, nzbget_category=None, download_dir=None, blackhole=0, blackhole_dir=None, usenet_retention=None, newznab=0, newznab_host=None, newznab_apikey=None, + sab_category=None, nzbget_host=None, nzbget_username='nzbget', nzbget_password=None, nzbget_category=None, download_dir=None, blackhole=0, blackhole_dir=None, usenet_retention=None, newznab=0, newznab_host=None, newznab_apikey=None, newznab_enabled=0, nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, nzbsrus=0, nzbsrus_uid=None, nzbsrus_apikey=None, nzbx=0, preferred_words=None, required_words=None, ignored_words=None, preferred_quality=0, preferred_bitrate=None, detect_bitrate=0, move_files=0, torrentblackhole_dir=None, download_torrent_dir=None, numberofseeders=10, use_isohunt=0, use_kat=0, use_mininova=0, waffles=0, waffles_uid=None, waffles_passkey=None, whatcd=0, whatcd_username=None, whatcd_password=None,