From 2c0f6a16a05fe42797a1fe5f8a16c0c5402d7116 Mon Sep 17 00:00:00 2001
From: angelblue05 <angelblue.dev@gmail.com>
Date: Fri, 7 Sep 2018 16:34:14 -0500
Subject: [PATCH] Add verify advanced settings

To remove cleanonupdate if plugin paths are used
---
 resources/lib/full_sync.py   |  5 +++--
 resources/lib/helper/xmls.py | 43 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/resources/lib/full_sync.py b/resources/lib/full_sync.py
index ef738a12..f3735e60 100644
--- a/resources/lib/full_sync.py
+++ b/resources/lib/full_sync.py
@@ -41,7 +41,9 @@ class FullSync(object):
         else:
             self.mapping()
 
-        self.start()
+        xmls.sources()
+        if not xmls.advanced_settings():
+            self.start()
 
     def mapping(self):
 
@@ -111,7 +113,6 @@ class FullSync(object):
         
         ''' Main sync process.
         '''
-        xmls.sources()
         start_time = datetime.datetime.now()
 
         for library in list(self.sync['Libraries']):
diff --git a/resources/lib/helper/xmls.py b/resources/lib/helper/xmls.py
index 00dfdce4..89fbd5fd 100644
--- a/resources/lib/helper/xmls.py
+++ b/resources/lib/helper/xmls.py
@@ -9,7 +9,7 @@ import xml.etree.ElementTree as etree
 
 import xbmc
 
-from . import _, indent, write_xml
+from . import _, indent, write_xml, dialog
 
 #################################################################################################
 
@@ -80,37 +80,36 @@ def tvtunes_nfo(path, urls):
     indent(xml)
     write_xml(etree.tostring(xml, 'UTF-8'), path)
 
-"""
-def verify_advancedsettings():
-    # Track the existance of <cleanonupdate>true</cleanonupdate>
-    # incompatible with plugin paths
-    log.info("verifying advanced settings")
-    if settings('useDirectPaths') != "0": return
+def advanced_settings():
 
-    path = xbmc.translatePath("special://userdata/").decode('utf-8')
-    xmlpath = "%sadvancedsettings.xml" % path
+    ''' Track the existence of <cleanonupdate>true</cleanonupdate>
+        It is incompatible with plugin paths.
+    '''
+    if settings('useDirectPaths') != "0":
+        return
+
+    path = xbmc.translatePath("special://profile/").decode('utf-8')
+    file = os.path.join(path, 'advancedsettings.xml')
 
     try:
-        xmlparse = etree.parse(xmlpath)
-    except: # Document is blank or missing
+        xml = etree.parse(file).getroot()
+    except Exception:
         return
-    else:
-        root = xmlparse.getroot()
 
     video = root.find('videolibrary')
+
     if video is not None:
         cleanonupdate = video.find('cleanonupdate')
+
         if cleanonupdate is not None and cleanonupdate.text == "true":
-            log.warn("cleanonupdate disabled")
+
+            LOG.warn("cleanonupdate disabled")
             video.remove(cleanonupdate)
-            
-            try:
-                indent(root)
-            except: pass
-            etree.ElementTree(root).write(xmlpath)
-            
+
+            indent(xml)
+            write_xml(etree.tostring(xml, 'UTF-8'), path)
+
             xbmcgui.Dialog().ok(heading=language(29999), line1=language(33097))
             xbmc.executebuiltin('RestartApp')
+
             return True
-    return
-"""