changed from xbian default to normal default + fixed license notifications

This commit is contained in:
sjengfred
2013-06-24 20:54:41 +02:00
parent e97c990f00
commit 2771ca7dcf
8 changed files with 30 additions and 23 deletions
+1 -1
View File
@@ -250,7 +250,7 @@
</tr> </tr>
<tr> <tr>
<td><label for="nzbget_host">Host:</label> <td><label for="nzbget_host">Host:</label>
<br /><small>Usually http://localhost:9092</small> <br /><small>Usually http://localhost:6789</small>
</td> </td>
<td><input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30" maxlength="40" /></td> <td><input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30" maxlength="40" /></td>
</tr> </tr>
+1 -1
View File
@@ -130,7 +130,7 @@
<td> <td>
<h3>NZBget Host:</h3><input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30" maxlength="40"><br> <h3>NZBget Host:</h3><input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30" maxlength="40"><br>
<i class="smalltext">usually http://localhost:9092</i> <i class="smalltext">usually http://localhost:6789</i>
</td> </td>
<td> <td>
+1 -1
View File
@@ -145,7 +145,7 @@
<div class="row"> <div class="row">
<label>NZBget Host:</label> <label>NZBget Host:</label>
<input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30"> <input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30">
<small>usually http://localhost:9092</small> <small>usually http://localhost:6789</small>
</div> </div>
<div class="row"> <div class="row">
<label>NZBget Username</label> <label>NZBget Username</label>
+1 -1
View File
@@ -130,7 +130,7 @@
<td> <td>
<h3>NZBget Host:</h3><input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30" maxlength="40"><br> <h3>NZBget Host:</h3><input type="text" name="nzbget_host" value="${config['nzbget_host']}" size="30" maxlength="40"><br>
<i class="smalltext">usually http://localhost:9092</i> <i class="smalltext">usually http://localhost:6789</i>
</td> </td>
<td> <td>
+3 -1
View File
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Headphones. If not, see <http://www.gnu.org/licenses/>. # along with Headphones. If not, see <http://www.gnu.org/licenses/>.
# NZBGet support added by CurlyMo <development@xbian.org> as a part of XBian - XBMC on the Raspberry Pi
from __future__ import with_statement from __future__ import with_statement
import os, sys, subprocess import os, sys, subprocess
@@ -413,7 +415,7 @@ def initialize():
SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '') SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '')
SAB_CATEGORY = check_setting_str(CFG, 'SABnzbd', 'sab_category', '') 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_PASSWORD = check_setting_str(CFG, 'NZBget', 'nzbget_password', '')
NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', '') NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', '')
NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '') NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '')
+18 -17
View File
@@ -1,21 +1,22 @@
# This file is part of Headphones. # This file is modified to work with headphones by CurlyMo <development@xbian.org> as a part of XBian - XBMC on the Raspberry Pi
#
# 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 <http://www.gnu.org/licenses/>.
##################################### # Author: Nic Wolfe <nic@wolfeden.ca>
## Stolen from Sick-Beard's nzbget.py ## # 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 <http://www.gnu.org/licenses/>.
+2
View File
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Headphones. If not, see <http://www.gnu.org/licenses/>. # along with Headphones. If not, see <http://www.gnu.org/licenses/>.
# NZBGet support added by CurlyMo <development@xbian.org> as a part of XBian - XBMC on the Raspberry Pi
import urllib, urllib2, urlparse, httplib import urllib, urllib2, urlparse, httplib
import lib.feedparser as feedparser import lib.feedparser as feedparser
from lib.pygazelle import api as gazelleapi from lib.pygazelle import api as gazelleapi
+3 -1
View File
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Headphones. If not, see <http://www.gnu.org/licenses/>. # along with Headphones. If not, see <http://www.gnu.org/licenses/>.
# NZBGet support added by CurlyMo <development@xbian.org> as a part of XBian - XBMC on the Raspberry Pi
import os import os
import cherrypy 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, 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, 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, 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, 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, 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,