Skip to content

Make Kodi version getting safer #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glennguy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make Kodi version getting safer #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d668be
Make Kodi version getting safer
glennguy Apr 22, 2020
23b3010
Revert some redundant changes
glennguy Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/aussieaddonscommon/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,17 @@ def get_kodi_build():
try:
return xbmc.getInfoLabel("System.BuildVersion")
except Exception:
return
return None


def get_kodi_version():
"""Return the version number of Kodi"""
build = get_kodi_build()
version = build.split(' ')[0]
return version
if build:
version = build.split(' ')[0]
return version
else:
return '0'


def get_kodi_major_version():
Expand Down
10 changes: 10 additions & 0 deletions lib/tests/unit/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,21 @@ def test_get_kodi_version(self, mock_info_label):
mock_info_label.return_value = fakes.BUILD_VERSION
self.assertEqual('18.2', utils.get_kodi_version())

@mock.patch('xbmc.getInfoLabel')
def test_get_kodi_version_none(self, mock_info_label):
mock_info_label.return_value = None
self.assertEqual('0', utils.get_kodi_version())

@mock.patch('xbmc.getInfoLabel')
def test_get_kodi_major_version(self, mock_info_label):
mock_info_label.return_value = fakes.BUILD_VERSION
self.assertEqual(18, utils.get_kodi_major_version())

@mock.patch('xbmc.getInfoLabel')
def test_get_kodi_major_version_blank(self, mock_info_label):
mock_info_label.return_value = ''
self.assertEqual(0, utils.get_kodi_major_version())

@mock.patch('xbmcaddon.Addon', fakes.FakeAddon)
@mock.patch('xbmc.log')
@mock.patch('xbmc.getCondVisibility')
Expand Down