From 6f870cc4f83bfc35afc20087989e823b03e15aab Mon Sep 17 00:00:00 2001
From: im85288 <ianmalcolmmclaughlin@gmail.com>
Date: Thu, 26 Mar 2015 16:33:31 +0000
Subject: [PATCH] sync options removed from settings
---
addon.xml | 2 +-
resources/lib/LibrarySync.py | 32 +++++++++++++++++++++++---------
resources/settings.xml | 4 ++--
3 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/addon.xml b/addon.xml
index 90f58b62..560c8845 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.emby"
name="Emby"
- version="0.0.2"
+ version="0.0.3"
provider-name="Emby.media">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/resources/lib/LibrarySync.py b/resources/lib/LibrarySync.py
index 4887c13b..2f351ca3 100644
--- a/resources/lib/LibrarySync.py
+++ b/resources/lib/LibrarySync.py
@@ -43,31 +43,45 @@ class LibrarySync():
startupDone = True
#are we running startup sync or background sync ?
- if not startupDone:
- syncOption = addon.getSetting("syncSettingStartup")
- else:
- syncOption = addon.getSetting("syncSettingBackground")
+ #if not startupDone:
+ # syncOption = addon.getSetting("syncSettingStartup")
+ #else:
+ # syncOption = addon.getSetting("syncSettingBackground")
#what sync method to perform ?
- if syncOption == "Full Sync":
+ #if syncOption == "Full Sync":
#pr = utils.startProfiling()
- self.MoviesSync(True)
+ # self.MoviesSync(True)
#utils.stopProfiling(pr, "MoviesSync(True)")
#pr = utils.startProfiling()
- self.TvShowsSync(True)
+ # self.TvShowsSync(True)
#utils.stopProfiling(pr, "TvShowsSync(True)")
#pr = utils.startProfiling()
- self.MusicVideosSync(True)
+ # self.MusicVideosSync(True)
#utils.stopProfiling(pr, "MusicVideosSync(True)")
- if syncOption == "Incremental Sync":
+ #if syncOption == "Incremental Sync":
+ # self.MoviesSync(False)
+ # self.TvShowsSync(False)
+ # self.MusicVideosSync(False)
+
+ # Do incremental sync followed by full sync
+ if not startupDone:
+ self.MoviesSync(True)
+ self.TvShowsSync(True)
+ self.MusicVideosSync(True)
+ else:
self.MoviesSync(False)
self.TvShowsSync(False)
self.MusicVideosSync(False)
+ self.MoviesSync(True)
+ self.TvShowsSync(True)
+ self.MusicVideosSync(True)
+
WINDOW.setProperty("startup", "done")
return True
diff --git a/resources/settings.xml b/resources/settings.xml
index 42c3959c..596db64e 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -9,8 +9,8 @@
<category label="Automatic sync"> <!-- Auto sync optionss -->
<setting id="enablePlayCountSync" type="bool" label="Enable watched/resume status sync" default="true" visible="true" enable="true" />
- <setting id="syncSettingStartup" type="labelenum" label="Startup Sync:" values="Full Sync|Incremental Sync|None" default="Full Sync" />
- <setting id="syncSettingBackground" type="labelenum" label="Scheduled Sync:" values="Full Sync|Incremental Sync|None" default="Incremental Sync" visible="true" enable="true" />
+ <!-- <setting id="syncSettingStartup" type="labelenum" label="Startup Sync:" values="Full Sync|Incremental Sync|None" default="Full Sync" />
+ <setting id="syncSettingBackground" type="labelenum" label="Scheduled Sync:" values="Full Sync|Incremental Sync|None" default="Incremental Sync" visible="true" enable="true" /> -->
<setting id="dbSyncIndication" type="labelenum" label="DB Sync Indication:" values="None|Notify OnChange|Notify OnFinish|BG Progress|Dialog Progress" default="None" />
<setting id="playCountSyncIndication" type="labelenum" label="Play Count Sync Indication:" values="None|Notify OnChange|Notify OnFinish|BG Progress|Dialog Progress" default="None" />
</category>