From ed754796fc5c97605e2e276e65a603123e4e41a0 Mon Sep 17 00:00:00 2001
From: evilhero <evilhero@gmail.com>
Date: Fri, 12 Jun 2015 21:28:02 -0400
Subject: [PATCH] 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

---
 data/interfaces/default/config.html | 43 ++++++-----------------------
 data/interfaces/default/index.html  |  3 --
 mylar/filechecker.py                |  3 +-
 3 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index b62194be..c669016e 100755
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -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>
 
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index c72cf155..01f09096 100755
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -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",
diff --git a/mylar/filechecker.py b/mylar/filechecker.py
index c1fc9529..e36a72cf 100755
--- a/mylar/filechecker.py
+++ b/mylar/filechecker.py
@@ -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,