Skip to content

Commit 9cff6ed

Browse files
committed
Review suggestions for backwards compatibility
1 parent e3e6ca0 commit 9cff6ed

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

.github/workflows/addon-submitter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
upload_url: ${{ steps.create_release.outputs.upload_url }}
4343
asset_path: ${{ steps.kodi-addon-submitter.outputs.addon-zip }}
4444
asset_name: ${{ steps.kodi-addon-submitter.outputs.addon-zip }}
45-
asset_content_type: application/zip
45+
asset_content_type: application/zip

addon.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<addon id="script.module.xbmcswift2" name="xbmcswift2" provider-name="Jonathan Beluch (jbel), Team Kodi" version="2.5.0">
1+
<addon id="script.module.xbmcswift2" name="xbmcswift2" provider-name="Jonathan Beluch (jbel), enen92" version="2.5.0">
22
<requires>
33
<import addon="xbmc.python" version="2.14.0" />
44
</requires>

lib/xbmcswift2/listitem.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
:license: GPLv3, see LICENSE for more details.
1010
'''
1111
from xbmcswift2 import xbmcgui
12+
from xbmcswift2.logger import log
1213

1314

1415
class ListItem(object):
1516
'''A wrapper for the xbmcgui.ListItem class. The class keeps track
1617
of any set properties that xbmcgui doesn't expose getters for.
1718
'''
18-
def __init__(self, label=None, label2=None, icon=None, thumbnail=None, fanart=None,
19-
path=None):
19+
def __init__(self, label=None, label2=None, icon=None, thumbnail=None,
20+
path=None, fanart=None):
2021
'''Defaults are an emtpy string since xbmcgui.ListItem will not
2122
accept None.
2223
'''
@@ -56,14 +57,17 @@ def get_context_menu_items(self):
5657
'''Returns the list of currently set context_menu items.'''
5758
return self._context_menu_items
5859

59-
def add_context_menu_items(self, items):
60-
'''Adds context menu items. If replace_items is True all
61-
previous context menu items will be removed.
60+
def add_context_menu_items(self, items, replace_items=False):
61+
'''Adds context menu items. replace_items is only kept for
62+
legacy reasons, its functionality was removed.
6263
'''
6364
for label, action in items:
6465
assert isinstance(label, basestring)
6566
assert isinstance(action, basestring)
6667

68+
if replace_items:
69+
log.warning("Replacing context menu items functionality was removed.")
70+
6771
self._context_menu_items.extend(items)
6872
self._listitem.addContextMenuItems(items)
6973

@@ -190,16 +194,16 @@ def as_xbmc_listitem(self):
190194
return self._listitem
191195

192196
@classmethod
193-
def from_dict(cls, label=None, label2=None, icon=None, thumbnail=None, fanart=None,
197+
def from_dict(cls, label=None, label2=None, icon=None, thumbnail=None,
194198
path=None, selected=None, info=None, properties=None,
195-
context_menu=None,
196-
is_playable=None, info_type='video', stream_info=None):
199+
context_menu=None, replace_context_menu=False,
200+
is_playable=None, info_type='video', stream_info=None, fanart=None):
197201
'''A ListItem constructor for setting a lot of properties not
198202
available in the regular __init__ method. Useful to collect all
199203
the properties in a dict and then use the **dct to call this
200204
method.
201205
'''
202-
listitem = cls(label, label2, icon, thumbnail, fanart, path)
206+
listitem = cls(label, label2, icon, thumbnail, path, fanart)
203207

204208
if selected is not None:
205209
listitem.select(selected)

0 commit comments

Comments
 (0)