FIX: Added warning to 32P Auth mode option to not use VPN with selected option, FIX: Main index page can now be sortable by Have column, FIX: Will now ignore any folders labelled as 'extras' (case-insensitive) when doing file-checking

This commit is contained in:
evilhero 2015-06-12 21:28:02 -04:00
parent 35f7a1de47
commit ed754796fc
3 changed files with 10 additions and 39 deletions

View File

@ -499,13 +499,15 @@
</div>
<div class="row checkbox left clearfix">
<input type="checkbox" id="enable_32p" onclick="initConfigCheckbox($(this));" name="enable_32p" value=1 ${config['enable_32p']} /><label>Enable 32P</label>
<div align="right">
<small class="heading"><span style="float: right; margin-right: .3em; margin-top: 4px;" class="ui-icon ui-icon-info"></span>python 2.7.9 required for 32P usage.</small>
<div align="left">
<small class="heading"><span style="float: left; margin-left: .3em; margin-top: 4px;" class="ui-icon ui-icon-info"></span>python 2.7.9 required for 32P usage</small>
</div>
</div>
<div class="config">
<fieldset>
<input type="radio" name="mode_32p" id="legacymode_32p" value="0" ${config['legacymode_32p']}> Legacy Mode <input type="radio" name="mode_32p" id="authmode_32p" value="1" ${config['authmode_32p']}> Auth Mode
<div align="center">
<input type="radio" name="mode_32p" id="legacymode_32p" value="0" ${config['legacymode_32p']}> Legacy Mode <input type="radio" name="mode_32p" id="authmode_32p" value="1" ${config['authmode_32p']}> Auth Mode
</div>
</fieldset>
<fieldset id="legacy32p_options">
<div class="row">
@ -520,6 +522,9 @@
</div>
</fieldset>
<fieldset id="auth32p_options">
<div align="center">
<small class="heading">do NOT use a VPN with this option</small>
</div>
<div class="row">
<label>&nbspUserName</label>
<input type="text" name="username_32p" value="${config['username_32p']}" size="36">
@ -531,38 +536,6 @@
</div>
</fieldset>
</div>
<!--
<div class="row checkbox left clearfix">
<input type="checkbox" id="legacymode_32p" onclick="initConfigCheckbox($(this));" name="legacymode_32p" value=1 ${config['legacymode_32p']} /><label>RSS Feed mode (Legacy mode)</label>
</div>
<div class="config">
<div class="row">
<label>&nbspPasskey</label>
<input type="text" name="passkey_32p" value="${config['passkey_32p']}" size="36">
</div>
<div class="row">
<label>&nbspRSS feed</label>
<input type="text" name="rssfeed_32p" value="${config['rssfeed_32p']}" size="36">
<small>( enter in the full url for any CURRENT 32P RSS feed )</small>
<small>( Currently will only montior NEW releases feed )</small>
</div>
</div>
<div class="row checkbox left clearfix">
<input type="checkbox" id="authmode_32p" onclick="initConfigCheckbox($(this));" name="authmode_32p" value=1 ${config['authmode_32p']} /><label>Auth mode (User/Pass)</label>
</div>
<div class="config"">
<div class="row">
<label>&nbspUserName</label>
<input type="text" name="username_32p" value="${config['username_32p']}" size="36">
</div>
<div class="row">
<label>&nbspPassword</label>
<input type="password" name="password_32p" value="${config['password_32p']}" size="36">
<small>( monitor the NEW releases feed & your personal notifications )</small>
</div>
</div>
</div>
-->
</div>
</fieldset>

View File

@ -74,9 +74,6 @@
$('#series_table').dataTable(
{
"bDestroy": true,
"aoColumnDefs": [
{ 'bSortable': false, 'aTargets': [ 5 ] }
],
"aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, 'All' ]],
"oLanguage": {
"sLengthMenu":"Show _MENU_ results per page",

View File

@ -1177,8 +1177,9 @@ def traverse_directories(dir):
direc = ''
else:
direc = dirname
if '.AppleDouble' in direc:
if '.AppleDouble' in direc or 'extras' in direc.lower():
#Ignoring MAC OS Finder directory of cached files (/.AppleDouble/<name of file(s)>)
#Ignore 'extras' directory within series folder
continue
filelist.append({"directory": direc,