diff --git a/addon.xml b/addon.xml index fb3ac85..17e5e4b 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index daf80dd..50c7649 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -143,11 +143,11 @@ msgid "N/A" msgstr "" msgctxt "#30091" -msgid "Confirm file delete?" +msgid "Confirm delete?" msgstr "" msgctxt "#30092" -msgid "Delete this item? This action will delete media and associated data files." +msgid "Warning: This action will delete the media files from the server." msgstr "" msgctxt "#30110" diff --git a/resources/lib/functions.py b/resources/lib/functions.py index d1d659b..0b5cfbf 100644 --- a/resources/lib/functions.py +++ b/resources/lib/functions.py @@ -112,9 +112,9 @@ def mainEntryPoint(): elif sys.argv[1] == "unmarkFavorite": item_id = sys.argv[2] unmarkFavorite(item_id) - elif sys.argv[1] == "delete": - item_id = sys.argv[2] - delete(item_id) + #elif sys.argv[1] == "delete": + # item_id = sys.argv[2] + # delete(item_id) elif mode == "playTrailer": item_id = params["id"] playTrailer(item_id) @@ -208,7 +208,7 @@ def markWatched(item_id): downloadUtils.downloadUrl(url, postBody="", method="POST") home_window = HomeWindow() home_window.setProperty("force_data_reload", "true") - checkForNewContent() + home_window.setProperty("embycon_widget_reload", str(time.time())) xbmc.executebuiltin("Container.Refresh") @@ -218,7 +218,7 @@ def markUnwatched(item_id): downloadUtils.downloadUrl(url, method="DELETE") home_window = HomeWindow() home_window.setProperty("force_data_reload", "true") - checkForNewContent() + home_window.setProperty("embycon_widget_reload", str(time.time())) xbmc.executebuiltin("Container.Refresh") @@ -228,7 +228,7 @@ def markFavorite(item_id): downloadUtils.downloadUrl(url, postBody="", method="POST") home_window = HomeWindow() home_window.setProperty("force_data_reload", "true") - checkForNewContent() + home_window.setProperty("embycon_widget_reload", str(time.time())) xbmc.executebuiltin("Container.Refresh") @@ -238,12 +238,21 @@ def unmarkFavorite(item_id): downloadUtils.downloadUrl(url, method="DELETE") home_window = HomeWindow() home_window.setProperty("force_data_reload", "true") - checkForNewContent() + home_window.setProperty("embycon_widget_reload", str(time.time())) xbmc.executebuiltin("Container.Refresh") -def delete(item_id): - return_value = xbmcgui.Dialog().yesno(i18n('confirm_file_delete'), i18n('file_delete_confirm')) +def delete(item): + + item_id = item.get("Id") + item_name = item.get("Name") + series_name = item.get("SeriesName") + if series_name: + final_name = series_name + " - " + item_name + else: + final_name = item_name + + return_value = xbmcgui.Dialog().yesno(i18n('confirm_file_delete'), final_name, i18n('file_delete_confirm')) if return_value: log.debug('Deleting Item: {0}', item_id) url = '{server}/emby/Items/' + item_id @@ -252,7 +261,8 @@ def delete(item_id): downloadUtils.downloadUrl(url, method="DELETE") progress.close() home_window = HomeWindow() - checkForNewContent() + home_window.setProperty("force_data_reload", "true") + home_window.setProperty("embycon_widget_reload", str(time.time())) xbmc.executebuiltin("Container.Refresh") @@ -633,23 +643,18 @@ def showMenu(params): elif selected_action == "emby_set_favorite": markFavorite(item_id) - HomeWindow().setProperty("embycon_widget_reload", str(time.time())) elif selected_action == "emby_unset_favorite": unmarkFavorite(item_id) - HomeWindow().setProperty("embycon_widget_reload", str(time.time())) elif selected_action == "mark_watched": markWatched(item_id) - HomeWindow().setProperty("embycon_widget_reload", str(time.time())) elif selected_action == "mark_unwatched": markUnwatched(item_id) - HomeWindow().setProperty("embycon_widget_reload", str(time.time())) elif selected_action == "delete": - delete(item_id) - HomeWindow().setProperty("embycon_widget_reload", str(time.time())) + delete(result) elif selected_action == "view_season": parent_id = result["ParentId"] diff --git a/resources/lib/play_utils.py b/resources/lib/play_utils.py index ad3f688..cb501d4 100644 --- a/resources/lib/play_utils.py +++ b/resources/lib/play_utils.py @@ -10,6 +10,7 @@ import xbmcvfs from datetime import timedelta from datetime import datetime import json +import time from resources.lib.error import catch_except from simple_logging import SimpleLogging @@ -22,6 +23,7 @@ from json_rpc import json_rpc from datamanager import DataManager from item_functions import get_next_episode, extract_item_info from clientinfo import ClientInformation +from functions import delete log = SimpleLogging(__name__) download_utils = DownloadUtils() @@ -672,12 +674,7 @@ def promptForStopActions(item_id, current_possition): if prompt_to_delete: log.debug("Prompting for delete") - resp = xbmcgui.Dialog().yesno(i18n('confirm_file_delete'), i18n('file_delete_confirm'), autoclose=10000) - if resp: - log.debug("Deleting item: {0}", item_id) - url = "{server}/emby/Items/%s?format=json" % item_id - download_utils.downloadUrl(url, method="DELETE") - xbmc.executebuiltin("Container.Refresh") + delete(result) # prompt for next episode if (prompt_next_percentage < 100 and