From 46605c124662f866bef9500fc4b0a487601c8b65 Mon Sep 17 00:00:00 2001
From: StephenJCotton <cot.s.ton@gmail.com>
Date: Fri, 23 Dec 2016 13:11:44 -0500
Subject: [PATCH] New checkbox and config flag added to readinglist for
 maintaining folder structure on tablet.

---
 data/interfaces/default/readinglist.html | 3 +++
 mylar/__init__.py                        | 3 +++
 mylar/webserve.py                        | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/interfaces/default/readinglist.html b/data/interfaces/default/readinglist.html
index 05d76b59..15c32264 100755
--- a/data/interfaces/default/readinglist.html
+++ b/data/interfaces/default/readinglist.html
@@ -100,6 +100,9 @@
                                         <label>Download Location:</label>
                                         <input type="text" placeholder="Full path (or jailed path)" name="tab_directory" value="${mylar.TAB_DIRECTORY}" size="36" /></br>
                                     </div>
+                                    <div class="row checkbox left clearfix">
+                                      <input type="checkbox" style="vertical-align: middle; margin: 3px; margin-top: -1px;" name="maintainseriesfolder" id="maintainseriesfolder" value="1" ${checked(mylar.MAINTAINSERIESFOLDER)} /><label for="maintainseriesfolder">Maintain Comic Folder Structure when Syncing to Tablet</label></br>
+                                    </div>
                                 </div>
                    </fieldset>
                   </td>
diff --git a/mylar/__init__.py b/mylar/__init__.py
index f46ccdd0..f1241e7f 100755
--- a/mylar/__init__.py
+++ b/mylar/__init__.py
@@ -315,6 +315,7 @@ GRABBAG_DIR = None
 HIGHCOUNT = 0
 READ2FILENAME = 0
 SEND2READ = 0
+MAINTAINSERIESFOLDER = 0
 TAB_ENABLE = 0
 TAB_HOST = None
 TAB_USER = None
@@ -638,6 +639,7 @@ def initialize():
         HIGHCOUNT = check_setting_int(CFG, 'General', 'highcount', 0)
         if not HIGHCOUNT: HIGHCOUNT = 0
         READ2FILENAME = bool(check_setting_int(CFG, 'General', 'read2filename', 0))
+        MAINTAINSERIESFOLDER = bool(check_setting_int(CFG, 'General', 'maintainseriesfolder', 0))
         SEND2READ = bool(check_setting_int(CFG, 'General', 'send2read', 0))
         TAB_ENABLE = bool(check_setting_int(CFG, 'General', 'tab_enable', 0))
         TAB_HOST = check_setting_str(CFG, 'General', 'tab_host', '')
@@ -1456,6 +1458,7 @@ def config_write():
     new_config['General']['highcount'] = HIGHCOUNT
     new_config['General']['read2filename'] = int(READ2FILENAME)
     new_config['General']['send2read'] = int(SEND2READ)
+    new_config['General']['maintainseriesfolder'] = int(MAINTAINSERIESFOLDER)
     new_config['General']['tab_enable'] = int(TAB_ENABLE)
     new_config['General']['tab_host'] = TAB_HOST
     new_config['General']['tab_user'] = TAB_USER
diff --git a/mylar/webserve.py b/mylar/webserve.py
index f114f108..f28f3bb7 100755
--- a/mylar/webserve.py
+++ b/mylar/webserve.py
@@ -4311,8 +4311,9 @@ class WebInterface(object):
         raise cherrypy.HTTPRedirect("comicDetails?ComicID=%s" % ComicID)
     comic_config.exposed = True
 
-    def readlistOptions(self, send2read=0, tab_enable=0, tab_host=None, tab_user=None, tab_pass=None, tab_directory=None):
+    def readlistOptions(self, send2read=0, tab_enable=0, tab_host=None, tab_user=None, tab_pass=None, tab_directory=None, maintainseriesfolder=0):
         mylar.SEND2READ = int(send2read)
+        mylar.MAINTAINSERIESFOLDER = int(maintainseriesfolder)
         mylar.TAB_ENABLE = int(tab_enable)
         mylar.TAB_HOST = tab_host
         mylar.TAB_USER = tab_user