0.1.56

addon.py

@@ -28,6 +28,9 @@ proxy_url = plugin.get_setting("general_proxy_url",str)
 playlist = plugin.get_setting("general_playlist",str)
 download_dir = plugin.get_setting("general_download_dir",str)
 view_mode = plugin.get_setting("general_view_mode",str)
+streams_file = plugin.get_setting("general_streams_file",str)
+streams_file_remote = plugin.get_setting("general_streams_file_remote",str)
+use_streams_file_remote = plugin.get_setting("general_use_streams_file_remote",bool)
 
 #storage_path = os.path.join(plugin.storage_path,"sources.p")
 if use_storage:
@@ -60,7 +63,20 @@ if use_storage and storage is not None and "sources" in storage:
     #sources = pickle.load(open(storage_path,"rb"))
 else:
     print "[playstream] Create sources objects"
-    sources = ContentSources.ContentSources(sources_directory)
+    if use_streams_file_remote:
+        try:
+            sources = ContentSources.ContentSources(sources_directory, streams_file_remote)
+        except Exception as e:
+            try:
+                sources = ContentSources.ContentSources(sources_directory, streams_file)
+                plugin.notify("Remote streams file is not available, fallback to local")
+            except Exception as e:
+                plugin.notify(e.message)
+    else:
+        try:
+            sources = ContentSources.ContentSources(sources_directory, streams_file)
+        except Exception as e:
+            plugin.notify(e.message)
 
 for source in sources.plugins:
     if not ("options" in dir(sources.plugins[source]) and sources.plugins[source].options): continue
@@ -125,6 +141,7 @@ def get_list(data):
     content = sources.get_content(data)
     print "[playstream] %s items returned"%len(content)
     items = []
+    i = 1
     for item in content:
         if item[1] == "back": continue
         title = item[0].decode("utf8") if isinstance(item[0],str) else item[0]
@@ -140,13 +157,23 @@ def get_list(data):
             ("Add to PlayStream favorites",
                 u'RunScript(special://home/addons/%s/context_menu.py,"add","%s","%s","%s","%s")'%(
                 plugin.id, title,  data2 ,img, desc)),
+            ]
+        if data.startswith("config::"):
+            lst = data.split("::")[1]
+            context_menu.extend([
             ("Delete from PlayStream favorites",
-                u'RunScript(special://home/addons/%s/context_menu.py,"delete","%s","%s","%s","%s")' % (
-                plugin.id, title, data2, img, desc)),
+                u'RunScript(special://home/addons/%s/context_menu.py,"delete","%s","%s")' % (
+                plugin.id, lst, i)),
+            ("Move in PlayStream favorites",
+                u'RunScript(special://home/addons/%s/context_menu.py,"move","%s","%s")' % (
+                plugin.id, lst, i)),
+            ])
+        if True:
+            context_menu.extend([
             ("Download",
              u'RunScript(special://home/addons/%s/context_download.py,"download","%s","%s","%s")' % (
                 plugin.id, title, data2, download_dir)),
-        ]
+            ])
         item = {
             "label": title,
             "path": prefix+data2,
@@ -160,6 +187,7 @@ def get_list(data):
         if view_mode == "Poster":
             item["poster"] = thumb_data(img, is_playable)
         items.append(item)
+        i += 1
     return items
 
 def play_video(streams):

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon version="0.1.55" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
+<addon version="0.1.56" 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,3 +1,9 @@
+**0.1.56** (10.03.2018)
+- [feature] PlayStream favoritiem sataisits Deleta un Move
+- [change] uzlabota ltc informācija
+- [feature] iespēja opcijās norādīt streams.cfg faila atrašanos/nosaukumu gan lokālā failu sistēmā gan remote (ftp://user:password@host/path/too/streams.cfg), gan http (rakstīšana netiek atbalstīta)
+- [change] filmix rādā visus tulkojumus/strīmus (agrak tikai pirmo)
+
 **0.1.55** (18.02.2018)
 - [bugfix] salabots ltc (arhīvs, epg u.c.)
 - [bugfix] salabots filmix search

context_menu.py

@@ -2,12 +2,19 @@ import sys, os, os.path
 from kodiswift import xbmc, xbmcgui, CLI_MODE
 from kodiswift import Plugin, storage
 from resources.lib.content import util
+try:
+    import wingdbstub
+except:
+    pass
 
 
-#plugin = Plugin()
+plugin = Plugin(addon_id="plugin.video.playstream")
 #plugin.load_addon_settings()
 #playlist = plugin.get_setting("general_playlist",str)
 #proxy_url = plugin.get_setting("general_proxy_url",str)
+streams_file = plugin.get_setting("general_streams_file",str)
+streams_file_remote = plugin.get_setting("general_streams_file_remote",str)
+use_streams_file_remote = plugin.get_setting("general_use_streams_file_remote",bool)
 
 cmd = sys.argv[1]
 #title = sys.argv[2]
@@ -15,23 +22,45 @@ cmd = sys.argv[1]
 #img = sys.argv[4]
 #desc = sys.argv[5]
 
-if cmd in ("add", "delete"):
+if cmd in ("add", "delete", "move"):
     from resources.lib.content.sources.config import Source
-    cfg = Source()
+    fname = streams_file_remote if use_streams_file_remote else streams_file
+    try:
+        cfg = Source(cfg_file=fname)
+    except Exception as e:
+        plugin.notify("Cannot open content config file %s" % fname)
     lists = cfg.get_lists()
     titles = [cfg.get_title(name) for name in lists]
 
-
 if cmd == "add":
     if not CLI_MODE:
         ret = xbmcgui.Dialog().select("Select menu",titles)
     else:
         ret = 3
-    cfg.add_item(lists[ret],sys.argv[2:])
-    cfg.write_streams()
+    if ret > 0:
+        cfg.add_item(lists[ret],sys.argv[2:])
+        cfg.write_streams()
 
 elif cmd == "delete":
-    xbmcgui.Dialog().ok("Info","Not yet implemented!")
+    cfg.del_item(sys.argv[2], int(sys.argv[3]))
+    cfg.write_streams()
+    xbmc.executebuiltin("Container.Refresh")
+
+elif cmd == "move":
+    name = sys.argv[2]
+    pos = int(sys.argv[3])
+    item = cfg.get_list_items(name)[pos]
+    cfg.del_item(name, pos)
+    ret = xbmcgui.Dialog().select("Select menu",titles)
+    if ret > 0:
+        name2 = lists[ret]
+        items2 = cfg.get_list_items(name)
+        items2 = [it[0] for it in items2]
+        ret = xbmcgui.Dialog().select("Select position before item will be insert",items2)
+        if ret > 0:
+            cfg.add_item(name2, item, ret)
+            cfg.write_streams()
+            xbmc.executebuiltin("Container.Refresh")
 
 elif cmd == "playlist":
     title = sys.argv[2]

kmake.bat

@@ -75,7 +75,6 @@ resources\lib\content\sources\serialguru.py
 resources\lib\content\sources\tvdom.py
 resources\lib\content\sources\ustvnow.py
 resources\lib\content\sources\viaplay.py
-resources\lib\content\sources\viaplay.py
 resources\lib\content\sources\YouTubeVideoUrl.py
 resources\lib\content\sources\jsinterp.py
 resources\lib\content\sources\swfinterp.py

kodiswift/plugin.py

@@ -58,7 +58,7 @@ class Plugin(XBMCMixin):
         self._name = name
         self._routes = []
         self._view_functions = {}
-        self._addon = xbmcaddon.Addon()
+        self._addon = xbmcaddon.Addon(addon_id) if addon_id else xbmcaddon.Addon()
 
         self._addon_id = addon_id or self._addon.getAddonInfo('id')
         self._name = name or self._addon.getAddonInfo('name')

resources/language/English/strings.xml

@@ -35,5 +35,8 @@
   <string id="50016">Playlist file (m3u)</string>
   <string id="50020">Autostart PlayStream</string>
   <string id="50021">View Mode</string>
+  <string id="50022">Local content config file location/name</string>
+  <string id="50023">Remote content config file location/name (ftp or http)</string>
+  <string id="50024">Use remote content config file</string>
 
 </strings>

resources/settings.xml

@@ -12,6 +12,9 @@
         <setting id="general_port" label="50014" type="number" default="8880" />
         <setting id="general_proxy_use" label="50017" type="bool" default="false" />
         <setting id="general_proxy_url" label="50015" type="text" default="http://localhost:8880/" />
+        <setting id="general_streams_file" label="50022" type="file" default="streams.cfg" />
+        <setting id="general_streams_file_remote" label="50023" type="text" default="ftp://user:password@hostname/hdd/streams.cfg" />
+        <setting id="general_use_streams_file_remote" label="50024" type="bool" default="false" />
     </category>
 
     <category label="40003">

version.txt

@@ -1 +1 @@
-0.1.55
+0.1.56