Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
Post-Processor tweaks
  * Ignores folders that start with `_unpack` or `_UNPACK`
  * If unable to figure out the quality from the filename, fallback
    to the episode (snatched) status
  * Other minor fixes and fixes to logging / when checks are applied.
    Commit 96d64e6

Change SB's git/source update routine to hopefully resolve the bug on
updating if you were more than 100 commits behind.

Cleanup Notifiers code. Pull #814 #823
  * Add **Always On** option for XBMC to control if sb should suppress errors
    when XBMC is offline or not.
  * Add logic to notifiers js to catch empty required fields to prevent
    unneeded testing calls.
  * Mention sending notices to Plex Home Theater (PHT), to use XBMC
    (since it mimics xbmc's json api) but with port 3005.

Update **tvdb_api** to latest. Pull #820

NZBGet update. Pull #821
  * Ported Prinz23's NZBGet 9+ appendurl + dupecheck/dupescore code from
    mr-orange's branch.
  * Fix username:password containing special characters.

Tweaked regex to filter out more subbed releases in case the indexer
did not assign them to the foreign category.
ex: `Bates.Motel.S02E07.REAL.PROPER.HDTV.XviD.HebSubs-DR`

Added `webm` to supported media extensions.

Update *rawHD* to support releases
like `Veep.S03E02.1080p.HDTV.DD5.1.H.264-NorTV`. Pull #826

Update local js for jquery 1.9.x compatibility and tweak _browser.js_. Pull #824
  * Added hack that allows users to specify `\\server\path` for a location
    and we load this as the initalDir browse path instead of previously saved value.
  * Set current path to what path we actually did load, in case the previous
    directory was not valid (we load parent folder instead)

Upgrade several js libs to fix IE related issues or to prepare for
upcoming jquery upgrade.
  * Upgrade _tablesorter_ 2.14 -> 2.16.3. Pull #827
  * Upgrade _jquery.form_ 3.35 -> 3.50 Pull #825
    * Fixed Config > Post Processing page not using ajaxForm.

Updated SB-Update message and the Config > Help & Info page to reflect
binary builds are now on GitHub instead of GoogleCode.
  • Loading branch information
Patrick Vos committed May 10, 2014
2 parents a211e87 + e76b300 commit 3349eff
Show file tree
Hide file tree
Showing 49 changed files with 1,857 additions and 1,458 deletions.
4 changes: 3 additions & 1 deletion data/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@ thead.tablesorter-stickyHeader {
background-color: #dfdacf;
}
/* filter widget */
.tablesorter .filtered {
display: none;
}
.tablesorter input.tablesorter-filter {
width: 98%;
height: auto;
Expand Down Expand Up @@ -981,7 +984,6 @@ td.tvShow a {
text-decoration: none;
display: block;
width: 100%;
height: 100%;
}
td.tvShow:hover a {
color:#000;
Expand Down
3 changes: 2 additions & 1 deletion data/interfaces/default/config.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
<tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sb"></i> Homepage </td><td><a href="http://www.sickbeard.com/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://www.sickbeard.com/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-web"></i> Forums </td><td><a href="http://sickbeard.com/forums/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://sickbeard.com/forums/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-github"></i> Source </td><td><a href="https://github.com/midgetspy/Sick-Beard/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">https://github.com/midgetspy/Sick-Beard/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-win"></i> Bug Tracker &amp;<br/> Windows Builds </td><td><a href="http://code.google.com/p/sickbeard/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://code.google.com/p/sickbeard/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-win"></i> Windows Builds </td><td><a href="https://github.com/midgetspy/Sick-Beard/releases/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">https://github.com/midgetspy/Sick-Beard/releases/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-web"></i> Bug Tracker </td><td><a href="http://code.google.com/p/sickbeard/issues/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://code.google.com/p/sickbeard/issues/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat </td><td><a href="irc://irc.freenode.net/#sickbeard" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;"><i>#sickbeard</i> on <i>irc.freenode.net</i></a></td></tr>
</table>
</div>
Expand Down
33 changes: 21 additions & 12 deletions data/interfaces/default/config_notifications.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
</div>

<div id="content_use_xbmc">
<div class="field-pair">
<input type="checkbox" name="xbmc_always_on" id="xbmc_always_on" #if $sickbeard.XBMC_ALWAYS_ON then "checked=\"checked\"" else ""# />
<label class="clearfix" for="xbmc_always_on">
<span class="component-title">Always On</span>
<span class="component-desc">Log errors when unreachable?</span>
</label>
</div>
<div class="field-pair">
<input type="checkbox" name="xbmc_notify_onsnatch" id="xbmc_notify_onsnatch" #if $sickbeard.XBMC_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
<label class="clearfix" for="xbmc_notify_onsnatch">
Expand Down Expand Up @@ -121,6 +128,7 @@
<img class="notifier-icon" src="$sbRoot/images/notifiers/plex.png" alt="" title="Plex Media Server" />
<h3><a href="http://www.plexapp.com/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Plex Media Server</a></h3>
<p>Experience your media on a visually stunning, easy to use interface on your Mac connected to your TV. Your media library has never looked this good!</p>
<p>For sending notifications to Plex Home Theater (PHT) clients, use the XBMC notifier with port <b>3005</b>.</p>
</div>
<fieldset class="component-group-list">
<div class="field-pair">
Expand Down Expand Up @@ -165,12 +173,12 @@
</div>
<div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">Plex Client IP:Port</span>
<span class="component-title">Plex Media Center IP:Port</span>
<input type="text" name="plex_host" id="plex_host" value="$sickbeard.PLEX_HOST" size="35" />
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">Host running Plex Client (eg. 192.168.1.100:3000)</span>
<span class="component-desc">Host running Plex Media Center (eg. 192.168.1.100:3000)</span>
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
Expand All @@ -179,26 +187,26 @@
</div>
<div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">Plex Client Username</span>
<span class="component-title">PMC Client Username</span>
<input type="text" name="plex_username" id="plex_username" value="$sickbeard.PLEX_USERNAME" size="35" />
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">Username of your Plex client API (blank for none)</span>
<span class="component-desc">Username of your PMC client (blank for none)</span>
</label>
</div>
<div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">Plex Client Password</span>
<span class="component-title">PMC Client Password</span>
<input type="password" name="plex_password" id="plex_password" value="$sickbeard.PLEX_PASSWORD" size="35" />
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">Password of your Plex client API (blank for none)</span>
<span class="component-desc">Password of your PMC client (blank for none)</span>
</label>
</div>
<div class="testNotification" id="testPLEX-result">Click below to test.</div>
<input type="button" class="btn" value="Test Plex Media Clients" id="testPLEX" />
<input type="button" class="btn" value="Test PMC Clients" id="testPLEX" />
<input type="submit" class="btn config_submitter" value="Save Changes" />
</div><!-- /content_use_plex -->

Expand Down Expand Up @@ -417,7 +425,7 @@
</div>
<div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">pyTivo Share name</span>
<span class="component-title">pyTivo Share Name</span>
<input type="text" name="pytivo_share_name" id="pytivo_share_name" value="$sickbeard.PYTIVO_SHARE_NAME" size="35" />
</label>
<label class="nocheck clearfix">
Expand Down Expand Up @@ -455,6 +463,7 @@
<img class="notifier-icon" src="$sbRoot/images/notifiers/growl.png" alt="" title="Growl" />
<h3><a href="http://growl.info/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Growl</a></h3>
<p>A cross-platform unobtrusive global notification system.</p>
<p>For more information visit our <a href="https://github.com/midgetspy/Sick-Beard/wiki/Notifiers:-Growl" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Wiki</a>.</p>
</div>
<fieldset class="component-group-list">
<div class="field-pair">
Expand Down Expand Up @@ -545,7 +554,7 @@
</div>
<div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">Prowl API key:</span>
<span class="component-title">Prowl API Key:</span>
<input type="text" name="prowl_api" id="prowl_api" value="$sickbeard.PROWL_API" size="35" />
</label>
<label class="nocheck clearfix">
Expand Down Expand Up @@ -669,7 +678,7 @@
<div class="component-group-desc">
<img class="notifier-icon" src="$sbRoot/images/notifiers/boxcar.png" alt="" title="Boxcar" />
<h3><a href="http://boxcar.io/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Boxcar</a></h3>
<p>Read your messages where and when you want them! A subscription will be send if needed.</p>
<p>Read your messages where and when you want them! A subscription will be sent if needed.</p>
</div>
<fieldset class="component-group-list">
<div class="field-pair">
Expand Down Expand Up @@ -746,7 +755,7 @@
</div>
<div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">NMA API key:</span>
<span class="component-title">NMA API Key:</span>
<input type="text" name="nma_api" id="nma_api" value="$sickbeard.NMA_API" size="35" />
</label>
<label class="nocheck clearfix">
Expand Down Expand Up @@ -892,7 +901,7 @@
</div>
<div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">Trakt API key:</span>
<span class="component-title">Trakt API Key:</span>
<input type="text" name="trakt_api" id="trakt_api" value="$sickbeard.TRAKT_API" size="35" />
</label>
<label class="nocheck clearfix">
Expand Down
2 changes: 1 addition & 1 deletion data/interfaces/default/config_postProcessing.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div id="config-content">
<h5>All non-absolute folder locations are relative to <span class="path">$sickbeard.DATA_DIR</span></h5>

<form id="configForms" action="savePostProcessing" method="post">
<form id="configForm" action="savePostProcessing" method="post">

<div id="config-components">

Expand Down
4 changes: 2 additions & 2 deletions data/interfaces/default/displayShow.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ Change selected episodes to
#for $epResult in $sqlResults:

#if int($epResult["season"]) != $curSeason:
<tr><td colspan="9"><a name="season-$epResult["season"]"></a></td></tr>
<tr class="seasonheader"><td colspan="9"><a name="season-$epResult["season"]"></a></td></tr>
<tr class="seasonheader" id="season-$epResult["season"]">
<td colspan="9">
<h2>#if int($epResult["season"]) == 0 then "Specials" else "Season "+str($epResult["season"])#</h2>
</td>
</tr>
<tr id="season-$epResult["season"]-cols"><th width="1%"><input type="checkbox" class="seasonCheck" id="$epResult["season"]" /></th><th>NFO</th><th>TBN</th><th>Episode</th><th>Name</th><th class="nowrap">Airdate</th><th>Filename</th><th>Status</th><th>Search</th></tr>
#set $curSeason = int($epResult["season"])
#end if
#end if

#set $epStr = str($epResult["season"]) + "x" + str($epResult["episode"])
#set $epLoc = $epResult["location"]
Expand Down
39 changes: 21 additions & 18 deletions data/interfaces/default/editShow.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -51,39 +51,42 @@

<form action="editShow" method="post">
<input type="hidden" name="show" value="$show.tvdbid" />
Location: <input type="text" name="location" id="location" value="$show._location" size="50" /><br />
<span class="showLegend">Location:</span><input type="text" name="location" id="location" value="$show._location" size="50" /><br />
<br />
Quality:
<span class="showLegend">Quality:</span>
#set $qualities = $common.Quality.splitQuality(int($show.quality))
#set global $anyQualities = $qualities[0]
#set global $bestQualities = $qualities[1]
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_qualityChooser.tmpl")
<br />
<br />
Language: <select name="tvdbLang" id="tvdbLangSelect"></select><br />
<span class="showLegend">Language:</span><select name="tvdbLang" id="tvdbLangSelect"></select><br />
Note: This will only affect the language of the retrieved metadata file contents and episode filenames.<br />
This <b>DOES NOT</b> allow Sick Beard to download non-english TV episodes!<br />
<br />

<span class="showLegend">Flatten files (no folders):</span><input type="checkbox" name="flatten_folders" #if $show.flatten_folders == 1 and not $sickbeard.NAMING_FORCE_FOLDERS then "checked=\"checked\"" else ""# #if $sickbeard.NAMING_FORCE_FOLDERS then "disabled=\"disabled\"" else ""#/><br />
<br />

<span class="showLegend">Paused:</span><input type="checkbox" name="paused" #if $show.paused == 1 then "checked=\"checked\"" else ""# /><br />
<br />
Flatten files (no folders): <input type="checkbox" name="flatten_folders" #if $show.flatten_folders == 1 and not $sickbeard.NAMING_FORCE_FOLDERS then "checked=\"checked\"" else ""# #if $sickbeard.NAMING_FORCE_FOLDERS then "disabled=\"disabled\"" else ""#/><br /><br />
Paused: <input type="checkbox" name="paused" #if $show.paused == 1 then "checked=\"checked\"" else ""# /><br /><br />

Air by date:
<input type="checkbox" name="air_by_date" #if $show.air_by_date == 1 then "checked=\"checked\"" else ""# /><br />
(check this if the show is released as Show.03.02.2010 rather than Show.S02E03)
<br /><br />
<span class="showLegend">Air by date:</span><input type="checkbox" name="air_by_date" #if $show.air_by_date == 1 then "checked=\"checked\"" else ""# /><br />
(check this if the show is released as Show.03.02.2010 rather than Show.S02E03)<br />
<br />

Ignored Words (all shows): $sickbeard.IGNORE_WORDS<br /><br />
<span class="showLegend">Ignored Words (all shows):</span>$sickbeard.IGNORE_WORDS<br />
<br />

Separate words with a comma, e.g. "word1,word2,word3"<br/><br/>
<span class="showLegend">Ignored Words (this show):</span><input type="text" name="rls_ignore_words" id="rls_ignore_words" value="$show.rls_ignore_words" size="50" /><br />
Results <b>with any</b> of these words in the title will be filtered out<br />
Separate words with a comma, e.g. "word1,word2,word3"<br />
<br />

Ignored Words (this show): <input type="text" name="rls_ignore_words" id="rls_ignore_words" value="$show.rls_ignore_words" size="50" /><br />
Results with any of these words in the title will be filtered out
<br /><br />
<span class="showLegend">Required Words (this show):</span><input type="text" name="rls_require_words" id="rls_require_words" value="$show.rls_require_words" size="50" /><br />
Results <b>without one</b> of these words in the title will be filtered out<br />
Separate words with a comma, e.g. "word1,word2,word3"<br />
<br />

Required Words (this show): <input type="text" name="rls_require_words" id="rls_require_words" value="$show.rls_require_words" size="50" /><br />
Results without one of these words in the title will be filtered out
<br /><br />
<input class="btn" type="submit" value="Submit" />
</form>

Expand Down
6 changes: 3 additions & 3 deletions data/interfaces/default/inc_top.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
<script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.10.4.custom.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.14.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.14.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.16.3.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.16.3.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.qtip-2012-04-26.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.pnotify-1.2.2.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.form-3.35.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.form-3.50.js?$sbPID"></script>

<script type="text/javascript" charset="utf-8">
<!--
Expand Down
16 changes: 9 additions & 7 deletions data/js/addExistingShow.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$(document).ready(function() {

$('#checkAll').live('click', function(){
$('#tableDiv').on('click', '#checkAll', function() {

var seasCheck = this;

$('.dirCheck').each(function(){
$('.dirCheck').each(function() {
this.checked = seasCheck.checked;
});
});

$('#submitShowDirs').click(function(){
$('#submitShowDirs').click(function() {

var dirArr = new Array();

Expand All @@ -35,7 +35,7 @@ $(document).ready(function() {

function loadContent() {
var url = '';
$('.dir_check').each(function(i,w){
$('.dir_check').each(function(i,w) {
if ($(w).is(':checked')) {
if (url.length) {
url += '&';
Expand Down Expand Up @@ -72,10 +72,12 @@ $(document).ready(function() {
loadContent();
});

$('.dir_check').live('click', loadContent);
$('#rootDirStaticList').on('click', '.dir_check', loadContent);

$('.showManage').live('click', function() {
$("#tabs").tabs( 'select', 0);
$('#tableDiv').on('click', '.showManage', function(event) {
event.preventDefault();
$("#tabs").tabs('option', 'active', 0);
$('html,body').animate({scrollTop:0}, 1000);
});

});
Loading

0 comments on commit 3349eff

Please sign in to comment.