Skip to content

Upgraded app to python 3 #6

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

Upgraded app to python 3 #6

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
8 changes: 4 additions & 4 deletions addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.pvr.plugin.player"
version="0.0.18"
version="0.0.19"
name="PVR Plugin Player"
provider-name="primaeval">
<requires>
<import addon="xbmc.python" version="2.20.0"/>
<import addon="script.module.xbmcswift2" version="2.4.0"/>
<import addon="script.module.requests" version="2.9.1" />
<import addon="xbmc.python" version="3.0.0"/>
<import addon="script.module.xbmcswift2" version="19.0.7"/>
<import addon="script.module.requests" version="2.25.1+matrix.1" />
</requires>
<extension point="xbmc.python.pluginsource" library="main.py">
<provides>video</provides>
Expand Down
51 changes: 25 additions & 26 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from types import *
from xbmcswift2 import Plugin
from xbmcswift2 import actions
import HTMLParser
from html.parser import HTMLParser
import datetime
import json
import os
Expand Down Expand Up @@ -33,7 +33,6 @@ def get_icon_path(icon_name):
addon_path = xbmcaddon.Addon().getAddonInfo("path")
return os.path.join(addon_path, 'resources', 'img', icon_name+".png")


def remove_formatting(label):
label = re.sub(r"\[/?[BI]\]",'',label)
label = re.sub(r"\[/?COLOR.*?\]",'',label)
Expand Down Expand Up @@ -231,6 +230,7 @@ def make_m3u():
f.write('%s\n' % url.replace('stream_search','stream_search_regex').encode("utf8"))
f.close()


@plugin.route('/export_channels')
def export_channels():
channels = plugin.get_storage('channels')
Expand Down Expand Up @@ -268,10 +268,10 @@ def folder(id,path):
context_items = []
if folder_path in folders:
fancy_label = "[COLOR yellow][B]%s[/B][/COLOR] " % label
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Folder', 'XBMC.RunPlugin(%s)' % (plugin.url_for(remove_folder, path=folder_path))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Folder', 'RunPlugin(%s)' % (plugin.url_for(remove_folder, path=folder_path))))
else:
fancy_label = "[B]%s[/B]" % label
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Folder', 'XBMC.RunPlugin(%s)' % (plugin.url_for(add_folder, id=id, name=label.encode("utf8"), path=folder_path))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Folder', 'RunPlugin(%s)' % (plugin.url_for(add_folder, id=id, name=label.encode("utf8"), path=folder_path))))
items.append(
{
'label': fancy_label,
Expand Down Expand Up @@ -349,10 +349,10 @@ def subscribe():
label = "PVR"
if pvr == "true":
fancy_label = "[COLOR yellow][B]%s[/B][/COLOR] " % label
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Folder', 'XBMC.RunPlugin(%s)' % (plugin.url_for(pvr_unsubscribe))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Folder', 'RunPlugin(%s)' % (plugin.url_for(pvr_unsubscribe))))
else:
fancy_label = "[B]%s[/B]" % label
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Folder', 'XBMC.RunPlugin(%s)' % (plugin.url_for(pvr_subscribe))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Folder', 'RunPlugin(%s)' % (plugin.url_for(pvr_subscribe))))
items.append(
{
'label': fancy_label,
Expand All @@ -369,10 +369,10 @@ def subscribe():
context_items = []
if id in ids:
fancy_label = "[COLOR yellow][B]%s[/B][/COLOR] " % label
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Folder', 'XBMC.RunPlugin(%s)' % (plugin.url_for(remove_folder, path=path))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Folder', 'RunPlugin(%s)' % (plugin.url_for(remove_folder, path=path))))
else:
fancy_label = "[B]%s[/B]" % label
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Folder', 'XBMC.RunPlugin(%s)' % (plugin.url_for(add_folder, id=id, name=label.encode("utf8"), path=path))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Folder', 'RunPlugin(%s)' % (plugin.url_for(add_folder, id=id, name=label.encode("utf8"), path=path))))
items.append(
{
'label': fancy_label,
Expand Down Expand Up @@ -572,8 +572,8 @@ def stream_search2(channel,regex=False):
stream_list.append((id,f,label))
else:
label_search = label.lower().replace(' ','')
if label_search in channel_search or channel_search in label_search:
stream_list.append((id,f,label))
if label_search in channel_search or channel_search in label_search:
stream_list.append((id,f,label))
if len(stream_list) == 1:
stream_name = stream_list[0][2]
stream_link = stream_list[0][1]
Expand Down Expand Up @@ -604,13 +604,12 @@ def play_channel(station):
def alternative_play(station):
streams = plugin.get_storage('streams')
if station in streams and streams[station]:
xbmc.executebuiltin('XBMC.RunPlugin(%s)' % streams[station])
xbmc.executebuiltin('RunPlugin(%s)' % streams[station])
else:
choose_stream(station)

@plugin.route('/choose_stream/<station>')
def choose_stream(station):
station = station.decode("utf8")
streams = plugin.get_storage('channels')
d = xbmcgui.Dialog()

Expand Down Expand Up @@ -676,7 +675,7 @@ def choose_stream(station):
dir = dirs[selected]
path = dir[1]
else:
link = links[selected]
link = links[selected - len(dirs)]
streams[station] = link[1]
name = link[0]
return
Expand Down Expand Up @@ -775,11 +774,11 @@ def channel_player():
items = []
for channel in sorted(channels):
context_items = []
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Choose Stream', 'XBMC.RunPlugin(%s)' % (plugin.url_for(choose_stream, station=channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Channel', 'XBMC.RunPlugin(%s)' % (plugin.url_for(add_channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Channel', 'XBMC.RunPlugin(%s)' % (plugin.url_for(remove_this_channel, channel=channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Import Channels', 'XBMC.RunPlugin(%s)' % (plugin.url_for(import_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Clear Channels', 'XBMC.RunPlugin(%s)' % (plugin.url_for(clear_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Choose Stream', 'RunPlugin(%s)' % (plugin.url_for(choose_stream, station=channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Channel', 'RunPlugin(%s)' % (plugin.url_for(add_channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Channel', 'RunPlugin(%s)' % (plugin.url_for(remove_this_channel, channel=channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Import Channels', 'RunPlugin(%s)' % (plugin.url_for(import_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Clear Channels', 'RunPlugin(%s)' % (plugin.url_for(clear_channels))))
items.append(
{
'label': channel,
Expand All @@ -797,8 +796,8 @@ def index():
items = []

context_items = []
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Clear Folders', 'XBMC.RunPlugin(%s)' % (plugin.url_for(clear))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Reset Cache', 'XBMC.RunPlugin(%s)' % (plugin.url_for(clear_cache))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Clear Folders', 'RunPlugin(%s)' % (plugin.url_for(clear))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Reset Cache', 'RunPlugin(%s)' % (plugin.url_for(clear_cache))))
items.append(
{
'label': u"Folders",
Expand All @@ -808,12 +807,12 @@ def index():
})

context_items = []
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Channel', 'XBMC.RunPlugin(%s)' % (plugin.url_for(add_channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Channel', 'XBMC.RunPlugin(%s)' % (plugin.url_for(remove_channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Import Channels', 'XBMC.RunPlugin(%s)' % (plugin.url_for(import_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Export Channels', 'XBMC.RunPlugin(%s)' % (plugin.url_for(export_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Clear Channels', 'XBMC.RunPlugin(%s)' % (plugin.url_for(clear_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Make m3u', 'XBMC.RunPlugin(%s)' % (plugin.url_for(make_m3u))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Add Channel', 'RunPlugin(%s)' % (plugin.url_for(add_channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Remove Channel', 'RunPlugin(%s)' % (plugin.url_for(remove_channel))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Import Channels', 'RunPlugin(%s)' % (plugin.url_for(import_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Export Channels', 'RunPlugin(%s)' % (plugin.url_for(export_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Clear Channels', 'RunPlugin(%s)' % (plugin.url_for(clear_channels))))
context_items.append(("[COLOR yellow][B]%s[/B][/COLOR] " % 'Make m3u', 'RunPlugin(%s)' % (plugin.url_for(make_m3u))))
items.append(
{
'label': "Channels",
Expand Down
12 changes: 4 additions & 8 deletions rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import json
#from xbmcswift2 import xbmc
import xbmc

class RPCType(type):
def __getattr__(cls, category):
return Category(category)

class RPC(object):
__metaclass__ = RPCType
class RPC(object, metaclass=RPCType):
pass

class Category(object):
def __init__(self, name):
Expand Down Expand Up @@ -44,10 +43,7 @@ def json_query(query):

xbmc_request = json.dumps(query)
raw = xbmc.executeJSONRPC(xbmc_request)
clean = unicode(raw, 'utf-8', errors='ignore')
response = json.loads(clean)
response = json.loads(raw)
if "error" in response:
raise RPCError(response["error"])
return response.get('result', response)


return response.get('result', response)
6 changes: 3 additions & 3 deletions service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from BaseHTTPServer import BaseHTTPRequestHandler,HTTPServer
from http.server import BaseHTTPRequestHandler,HTTPServer
from xbmcgui import ListItem
#from xbmc import executebuiltin, Player
import xbmc
Expand Down Expand Up @@ -35,8 +35,8 @@ def runService():

class myHandler(BaseHTTPRequestHandler):
def do_GET(self):
print 'HWA:'
print dummy_vid_path
print('HWA:')
print(dummy_vid_path)
f = open(dummy_vid_path, 'rb')
self.send_response(200)
self.send_header('Content-Type', 'video/mp4')
Expand Down