Skip to content

Port to Python 3 to work with Kodi 19, Matrix #7

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port to Python 3 to work with Kodi 19, Matrix #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="plugin.program.chrome.launcher" name="Chrome Launcher" version="1.1.1" provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.python" version="3.0.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
<provides>executable</provides>
Expand Down
28 changes: 15 additions & 13 deletions default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/python
#!/usr/bin/python3
# -*- coding: utf-8 -*-
import urllib
import urllib.parse
import sys
import re
import os
Expand Down Expand Up @@ -224,30 +224,32 @@ def parameters_string_to_dict(parameters):


def addDir(name, url, mode, iconimage, stopPlayback="", kiosk=""):
u = sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+urllib.quote_plus(mode)+"&stopPlayback="+urllib.quote_plus(stopPlayback)+"&kiosk="+urllib.quote_plus(kiosk)
u = sys.argv[0]+"?url="+urllib.parse.quote_plus(url)+"&mode="+urllib.parse.quote_plus(mode)+"&stopPlayback="+urllib.parse.quote_plus(stopPlayback)+"&kiosk="+urllib.parse.quote_plus(kiosk)
ok = True
liz = xbmcgui.ListItem(name, iconImage="DefaultFolder.png", thumbnailImage=iconimage)
liz = xbmcgui.ListItem(name)
liz.setArt({'icon': "DefaultFolder.png", 'thumb': iconimage})
liz.setInfo(type="Video", infoLabels={"Title": name})
ok = xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=u, listitem=liz, isFolder=True)
return ok


def addSiteDir(name, url, mode, iconimage, stopPlayback, kiosk):
u = sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+urllib.quote_plus(mode)+"&stopPlayback="+urllib.quote_plus(stopPlayback)+"&kiosk="+urllib.quote_plus(kiosk)
u = sys.argv[0]+"?url="+urllib.parse.quote_plus(url)+"&mode="+urllib.parse.quote_plus(mode)+"&stopPlayback="+urllib.parse.quote_plus(stopPlayback)+"&kiosk="+urllib.parse.quote_plus(kiosk)
ok = True
liz = xbmcgui.ListItem(name, iconImage="DefaultFolder.png", thumbnailImage=iconimage)
liz = xbmcgui.ListItem(name)
liz.setArt({'icon': "DefaultFolder.png", 'thumb': iconimage})
liz.setInfo(type="Video", infoLabels={"Title": name})
liz.addContextMenuItems([(translation(30006), 'RunPlugin(plugin://'+addonID+'/?mode=editSite&url='+urllib.quote_plus(name)+')',), (translation(30002), 'RunPlugin(plugin://'+addonID+'/?mode=removeSite&url='+urllib.quote_plus(name)+')',)])
liz.addContextMenuItems([(translation(30006), 'RunPlugin(plugin://'+addonID+'/?mode=editSite&url='+urllib.parse.quote_plus(name)+')',), (translation(30002), 'RunPlugin(plugin://'+addonID+'/?mode=removeSite&url='+urllib.parse.quote_plus(name)+')',)])
ok = xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=u, listitem=liz, isFolder=True)
return ok

params = parameters_string_to_dict(sys.argv[2])
mode = urllib.unquote_plus(params.get('mode', ''))
name = urllib.unquote_plus(params.get('name', ''))
url = urllib.unquote_plus(params.get('url', ''))
stopPlayback = urllib.unquote_plus(params.get('stopPlayback', 'no'))
kiosk = urllib.unquote_plus(params.get('kiosk', 'yes'))
userAgent = urllib.unquote_plus(params.get('userAgent', ''))
mode = urllib.parse.unquote_plus(params.get('mode', ''))
name = urllib.parse.unquote_plus(params.get('name', ''))
url = urllib.parse.unquote_plus(params.get('url', ''))
stopPlayback = urllib.parse.unquote_plus(params.get('stopPlayback', 'no'))
kiosk = urllib.parse.unquote_plus(params.get('kiosk', 'yes'))
userAgent = urllib.parse.unquote_plus(params.get('userAgent', ''))


if mode == 'addSite':
Expand Down