From 0b9b5d3e643cbde64bd7df5c6e1d013a60be2360 Mon Sep 17 00:00:00 2001
From: xnappo <cnappi@gmail.com>
Date: Sat, 4 Jul 2015 10:04:04 -0500
Subject: [PATCH] Expand offer delete to movies (optionally)
---
resources/language/English/strings.xml | 10 ++++++----
resources/lib/KodiMonitor.py | 2 +-
resources/lib/PlaybackUtils.py | 4 +++-
resources/lib/Player.py | 11 +++++++----
resources/settings.xml | 6 ++++--
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 33d65f09..a5c50521 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -97,9 +97,9 @@
<string id="30111">Include Stream Info</string>
<string id="30112">Include People</string>
<string id="30113">Include Overview</string>
- <string id="30114">On Resume Jump Back Seconds</string>
- <string id="30115"> - Offer delete when stopped above %</string>
- <string id="30116">Add Item and Played Counts</string>
+ <string id="30114">Offer delete after playback</string>
+ <string id="30115"> - For Episodes</string>
+ <string id="30116"> - For Movies</string>
<string id="30117">Background Art Refresh Rate (seconds)</string>
<string id="30118">Add Resume Percent</string>
<string id="30119">Add Episode Number</string>
@@ -110,7 +110,7 @@
<string id="30124">Downloading Jason Data</string>
<string id="30125">Done</string>
<string id="30126">Processing Item : </string>
- <string id="30127">Offer delete for watched episodes</string>
+ <string id="30127">YOUCANUSETHIS</string>
<string id="30128">Play Error</string>
<string id="30129">This item is not playable</string>
<string id="30130">Local path detected</string>
@@ -255,6 +255,8 @@
<string id="30310">Music Videos</string>
<string id="30311">Music Tracks</string>
<string id="30312">Channels</string>
+
+
diff --git a/resources/lib/KodiMonitor.py b/resources/lib/KodiMonitor.py
index e6be1443..e2d8cdd5 100644
--- a/resources/lib/KodiMonitor.py
+++ b/resources/lib/KodiMonitor.py
@@ -134,7 +134,7 @@ class Kodi_Monitor(xbmc.Monitor):
cursor.close
if jsondata:
- if jsondata.get("type") == "episode":
+ if jsondata.get("type") == "episode" or "movie":
url='{server}/mediabrowser/Items?Ids=' + id + '&format=json'
#This is a check to see if the item exists on the server, if it doesn't it may have already been deleted by another client
result = DownloadUtils().downloadUrl(url)
diff --git a/resources/lib/PlaybackUtils.py b/resources/lib/PlaybackUtils.py
index 8211e115..026ebeaa 100644
--- a/resources/lib/PlaybackUtils.py
+++ b/resources/lib/PlaybackUtils.py
@@ -379,8 +379,10 @@ class PlaybackUtils():
WINDOW.setProperty(playurl + "positionurl", positionurl)
WINDOW.setProperty(playurl + "deleteurl", "")
- if item.get("Type") == "Episode" and addon.getSetting("offerDelete")=="true":
+ if item.get("Type") == "Episode" and addon.getSetting("offerDeleteTV")=="true":
WINDOW.setProperty(playurl + "deleteurl", deleteurl)
+ if item.get("Type") == "Movie" and addon.getSetting("offerDeleteMovies")=="true":
+ WINDOW.setProperty(playurl + "deleteurl", deleteurl)
WINDOW.setProperty(playurl + "runtimeticks", str(item.get("RunTimeTicks")))
WINDOW.setProperty(playurl+"type", item.get("Type"))
diff --git a/resources/lib/Player.py b/resources/lib/Player.py
index 00390ea3..3e5fd9cd 100644
--- a/resources/lib/Player.py
+++ b/resources/lib/Player.py
@@ -103,15 +103,18 @@ class Player( xbmc.Player ):
self.stopPlayback(data)
- if percentComplete > .80 and data.get("Type") == "Episode" and addonSettings.getSetting("offerDelete")=="true":
+ offerDelete=False
+ if data.get("Type") == "Episode" and addonSettings.getSetting("offerDeleteTV")=="true":
+ offerDelete = True
+ elif data.get("Type") == "Movie" and addonSettings.getSetting("offerDeleteMovies")=="true":
+ offerDelete = True
+
+ if percentComplete > .80 and offerDelete == True:
return_value = xbmcgui.Dialog().yesno("Offer Delete", "Delete\n" + data.get("currentfile").split("/")[-1] + "\non Emby Server? ")
if return_value:
# Delete Kodi entry before Emby
listItem = [item_id]
LibrarySync().removefromDB(listItem, True)
- #if(refresh_id != None):
- #report updates playcount and resume status to Kodi and MB3
- #librarySync.updatePlayCount(item_id)
# Stop transcoding
if self.WINDOW.getProperty("transcoding%s" % item_id) == "true":
diff --git a/resources/settings.xml b/resources/settings.xml
index 6eaca198..83ea2959 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -25,7 +25,9 @@
<setting id="smbusername" type="text" label="30007" default="" visible="true" enable="true" />
<setting id="smbpassword" type="text" label="30008" default="" option="hidden" visible="true" enable="true" />
<setting type="sep" />
- <setting id="offerDelete" type="bool" label="30127" visible="true" enable="true" default="false" />
+ <setting id="offerDelete" type="bool" label="30114" visible="true" enable="true" default="false" />
+ <setting id="offerDeleteTV" type="bool" label=" 30115" visible="eq(-1,true)" enable="true" default="false" />
+ <setting id="offerDeleteMovies" type="bool" label="30116" visible="eq(-2,true)" enable="true" default="false" />
<setting id="playFromStream" type="bool" label="30002" visible="true" enable="true" default="false" />
<setting id="videoBitRate" type="enum" label="30160" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="eq(-1,true)" default="17" />
<setting id="forceTranscodingCodecs" type="text" label="30245" visible="false" />
@@ -35,7 +37,7 @@
<setting id="disableCoverArt" type="bool" label="30157" default="false" visible="true" enable="true" />
<setting id="coverArtratio" type="bool" label="Force CoverArt Ratio" visible="eq(-1,false)" default="false" enable="true" />
<setting id="ignoreSpecialsNextEpisodes" type="bool" label="Ignore specials in next episodes" visible="true" enable="true" default="false" />
- <setting id="showSpecialInfoDialog" type="bool" label="Show special Emby infodialog on play" default="false" visible="false" />
+ <setting id="showSpecialInfoDialog" type="bool" label="Show special Emby info dialog on play" default="false" visible="false" />
</category>
<category label="30022">
<setting id="logLevel" type="enum" label="30004" values="None|Info|Debug" default="0" />