izlabots context_menu

addon.py

@@ -20,6 +20,7 @@ for source in sources.plugins:
     sources.plugins[source].options_write(options)
 prefix = ""
 
+
 @plugin.route(".+" )
 def main():
     global prefix
@@ -27,6 +28,7 @@ def main():
     plugin.set_content("movies")
     data = plugin.request.url.replace(prefix,"")
     data = urllib.unquote(data)
+    sources.plugins["config"].read_streams()
     if not data:
         data = "config::home"
     if sources.is_video(data):
@@ -66,8 +68,15 @@ def get_list(data):
         is_playable = True if  sources.is_video(item[1]) else False
         img = item[2]
         desc = item[3].decode("utf8")
-        context_menu = [("Add to PlayStream favorites",
-                         'RunScript(special://home/addons/%s/context_menu.py,"add","%s","%s","%s","%s")'%(plugin.id, title,  data2,img, desc))]
+        context_menu = [
+            ("Add to PlayStream favorites", 'RunScript(special://home/addons/%s/context_menu.py,"add","%s","%s","%s","%s")'%(plugin.id, title,  item[1],img, desc)),
+            ("Delete from PlayStream favorites",
+                 'RunScript(special://home/addons/%s/context_menu.py,"delete","%s","%s","%s","%s")' % (
+                 plugin.id, title, item[1], img, desc)),
+            ("Download",
+             'RunScript(special://home/addons/%s/context_menu.py,"download","%s","%s","%s","%s")' % (
+                 plugin.id, title, item[1], img, desc)),
+        ]
         items.append({
             "label": title,
             "path": data2,

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon version="0.1.25" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
+<addon version="0.1.26" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" />

changelog.md

@@ -1,5 +1,8 @@
-**0.1.2** (12.02.2016):
-- initial exprerimental version
+**0.1.24** (23.03.2016):
+- subtitles, context menu etc added
 
 **0.1.5** (14.02.2016):
 - addon settings added
+
+**0.1.2** (12.02.2016):
+- initial exprerimental version

context_menu.py

@@ -0,0 +1,34 @@
+import sys, os, os.path
+from kodiswift import xbmc, xbmcgui, CLI_MODE
+from  resources.lib.sources.config import Source
+
+cfg = Source()
+lists = cfg.get_lists()
+titles = [cfg.get_title(name) for name in lists]
+cmd = sys.argv[1]
+
+if cmd == "add":
+    if not CLI_MODE:
+        ret = xbmcgui.Dialog().select("Select menu",titles)
+    else:
+        ret = 3
+    title = sys.argv[2]
+    img = sys.argv[3]
+    desc = sys.argv[4]
+    cfg.add_item(lists[ret],sys.argv[2:])
+    cfg.write_streams()
+
+elif cmd == "delete":
+    xbmcgui.Dialog().ok("Info","Not yet implemented!")
+
+elif cmd == "download":
+    xbmcgui.Dialog().ok("Info","Not yet implemented!")
+
+else:
+    xbmcgui.Dialog().ok("Error","Wrong command")
+
+
+
+#mode = "a" if os.path.exists("context_menu.log") else "w"
+#with open("context_menu.log", mode) as f:
+#    f.write("%s %s %s %s", sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])

project.wpr

@@ -221,7 +221,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': 0,
         'tree-states': {'deep': {'expanded-nodes': [],
-                                 'selected-nodes': [(13,)],
+                                 'selected-nodes': [(11,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
@@ -665,7 +665,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                None)],
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
-        'current_pages': [2,
+        'current_pages': [1,
                           1],
         'notebook_display': 'normal',
         'notebook_percent': 0.45990566037735847,
@@ -1040,14 +1040,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_end': 655L,
                                   'selection_start': 655L}),
                                 (loc('addon.py'),
-                                 {'attrib-starts': [('get_list',
-        58)],
-                                  'first-line': 100L,
+                                 {'attrib-starts': [],
+                                  'first-line': 4L,
                                   'folded-linenos': [],
-                                  'sel-line': 69L,
-                                  'sel-line-start': 2614L,
-                                  'selection_end': 2720L,
-                                  'selection_start': 2720L}),
+                                  'sel-line': 9L,
+                                  'sel-line-start': 276L,
+                                  'selection_end': 276L,
+                                  'selection_start': 276L}),
                                 (loc('changelog.md'),
                                  {'attrib-starts': [],
                                   'first-line': 0L,
@@ -1447,7 +1446,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'resources/lib/sources/ustvnow.py',
         u'addon.py']},
         'saved_notebook_display': None,
-        'split_percents': {0: 0.4442211055276382},
+        'split_percents': {0: 0.7909547738693468},
         'splits': 2,
         'tab_location': 'top',
         'user_data': {}},
@@ -1868,6 +1867,24 @@ guimgr.visual-state = {loc('config.py'): {'attrib-starts': [],
         'sel-line-start': 12403,
         'selection_end': 12403,
         'selection_start': 12403},
+                       loc('../../../../Python27/Lib/genericpath.py'): {'att'\
+        'rib-starts': [('_splitext',
+                        92)],
+        'first-line': 99L,
+        'folded-linenos': [],
+        'sel-line': 109L,
+        'sel-line-start': 3211L,
+        'selection_end': 3211L,
+        'selection_start': 3211L},
+                       loc('../../../../Python27/Lib/ntpath.py'): {'attrib-s'\
+        'tarts': [('splitext',
+                   198)],
+        'first-line': 182L,
+        'folded-linenos': [],
+        'sel-line': 199L,
+        'sel-line-start': 7089L,
+        'selection_end': 7089L,
+        'selection_start': 7089L},
                        loc('../../../../Python27/Lib/site-packages/xbmcswift2/cli/app.py'): {'a'\
         'ttrib-starts': [('once',
                           146)],
@@ -1893,24 +1910,6 @@ guimgr.visual-state = {loc('config.py'): {'attrib-starts': [],
         'sel-line-start': 29,
         'selection_end': 36,
         'selection_start': 36},
-                       loc('../../../../Python27/lib/genericpath.py'): {'att'\
-        'rib-starts': [('_splitext',
-                        92)],
-        'first-line': 99L,
-        'folded-linenos': [],
-        'sel-line': 109L,
-        'sel-line-start': 3211L,
-        'selection_end': 3211L,
-        'selection_start': 3211L},
-                       loc('../../../../Python27/lib/ntpath.py'): {'attrib-s'\
-        'tarts': [('splitext',
-                   198)],
-        'first-line': 182L,
-        'folded-linenos': [],
-        'sel-line': 199L,
-        'sel-line-start': 7089L,
-        'selection_end': 7089L,
-        'selection_start': 7089L},
                        loc('../../../../Python27/lib/site-packages/kodiswift/listitem.py'): {'a'\
         'ttrib-starts': [('ListItem',
                           20),

readme.md

@@ -5,20 +5,21 @@ Kodi plugin to to play various online streams (mostly Latvian).
 Stream sources are in  subfolder "resources/lib/sources", and can be added/customized
 Currently implemented:
 - Main menu and manual stream definition in sources/streams.cfg file
-- **replay.lsm.lv** media portal content (Latvian TV)
-- **skaties.lv** media portal content (MTG media portal Latvian version), other countries MTG contents are available through customizing main menu (country=xx)
-- **lattelecom.tv(shortcut.lv)** media portal content
-- **play24.lv** media portal content
-- **viaplay.lv**
-- **cinemalive.tv**
-- **movieplace.lv**
-- **dom.tv**
-- **BBC iPlayer**
-- **Euronews**
-- **filmon.tv** media portal content
-- **ustvnow.tv**
-- **serialguru.ru**
-- **filmix.net**
+- **replay.lsm.lv** - Latvian TV live streams and archive (Latvian)
+- **skaties.lv** - skaties.lv streams (Latvian LNT, TV3, TV3+, TV6, TV2)
+- **lattelecom.tv(shortcut.lv)** - live, archive and video (Latvian, English, Russian), account required
+- **play24.lv** - RigaTV24 live and archive (Latvian)
+- **viaplay.lv** - video streams (partly working, only non-DRM - Latvian, Russian)
+- **cinemalive.tv** - movies and series in Latvian (partly working)
+- **movieplace.lv** - movies and series in Latvian (partly working)
+- **dom.tv** - live and archive of Latvian and Russion TV channels, registration required
+- **BBC iPlayer** - BBC live and archive, UK IP address (VPN) required
+- **Euronews** - Euronews live and archive
+- **filmon.tv** - media portal content
+- **ustvnow.tv** - USA live TV (only SD), registration required
+- **filmix.net** - movies and series in Russian
+- **serialguru.ru** - movies and series in Russian (partly working)
+
 
 ---
 Copyright (c) 2016 ivars777 (ivars777@gmail.com)

resources/lib/sources/config.py

@@ -40,11 +40,13 @@ class Source(SourceBase):
                 self.lists[name] = []
             else:
                 if line[0] in ("#"): continue
-                items = tuple(line.strip().split("|"))
+                items = line.strip().split("|")
                 if not items[0]: continue
                 if len(items)==1:
                     self.titles[name] = items[0]
                 else:
+                    if len(items) == 4:
+                        items[3] = items[3].replace("\\n","\n")
                     self.lists[name].append(items)
 
     def write_streams(self):
@@ -52,7 +54,7 @@ class Source(SourceBase):
         for l in self.lists.keys():
             f.write("[%s]\n"%l)
             for item in self.lists[l]:
-                f.write("%s|%s|%s|%s\n"%(item[0],item[1],item[2],item[3]))
+                f.write("%s|%s|%s|%s\n"%(item[0].replace("\n",""),item[1],item[2],item[3].replace("\n","\\n")))
             f.write("\n")
         f.close()
 

version.txt

@@ -1 +1 @@
-0.1.25
+0.1.26