pielikts klāt XTV.lv

addon.py

@@ -41,7 +41,6 @@ streams_file_remote = plugin.get_setting("general_streams_file_remote",str)
 use_streams_file_remote = plugin.get_setting("general_use_streams_file_remote",bool)
 download_overwrite = plugin.get_setting("general_download_overwrite",bool)
 
-
 #storage_path = os.path.join(plugin.storage_path,"sources.p")
 if use_storage:
     try:
@@ -74,19 +73,17 @@ if use_storage and storage is not None and "sources" in storage:
 else:
     print "[playstream] Create sources objects"
     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)
+        cfg_file = streams_file_remote
+        cfg_file2 = streams_file
     else:
-        try:
-            sources = ContentSources.ContentSources(sources_directory, streams_file)
-        except Exception as e:
-            plugin.notify(e.message)
+        cfg_file = streams_file
+        cfg_file2 = None
+    try:
+        sources = ContentSources.ContentSources(sources_directory, cfg_file, cfg_file2)
+    except Exception as e:
+        xbmc.executebuiltin("Notification(Error,%s" % e.message)
+        xbmc.executebuiltin("XBMC.ActivateWindow(Home)")
+    #plugin.notify("Using streams file '%s'" % sources.plugins["config"].streams_file)
 
 for source in sources.plugins:
     if not ("options" in dir(sources.plugins[source]) and sources.plugins[source].options): continue

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon version="0.1.95" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
+<addon version="0.1.99" 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,4 +1,17 @@
-**0.1.94** (12.10.2018):
+**0.1.98** (26.01.2019):
+- [feature] pielikts klāt XTV.lv
+
+**0.1.98** (23.12.2018):
+- [fix] salabots filmix, tvplay
+
+**0.1.97** (05.12.2018):
+- [fix] pielabots ltc arhīvs (bildes, kārtība nfo)
+- [fix] download pielabots
+
+**0.1.96** (02.11.2018):
+- [fix] papildināts lmt (delfi video)
+
+**0.1.94** (12.10   .2018):
 - [fix] salabots replay
 
 **0.1.94** (04.09.2018):

context_download.py

@@ -18,9 +18,20 @@ import traceback
 #from twisted.internet import reactor, defer
 
 plugin = Plugin(addon_id="plugin.video.playstream")
+prefix = "plugin://%s/" % plugin.id
 #plugin.load_addon_settings()
 use_storage = plugin.get_setting("general_use_storage",bool) # TODO vajag nočekot vai nav labāk lietot pickle
+storage_ttl = plugin.get_setting("general_ttl",int)
+use_proxy = plugin.get_setting("general_proxy_use",bool)
+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)
 overwrite = plugin.get_setting("general_download_overwrite",bool)
+
 sleep_time = 5  # TODO jāliek iekš parametriem
 
 cunicode = lambda s: s.decode("utf8") if isinstance(s, str) else s
@@ -28,9 +39,9 @@ cstr = lambda s: s.encode("utf8") if isinstance(s, unicode) else s
 
 #print "argv=",sys.argv
 cmd = sys.argv[1]
-title = sys.argv[2]
-data = sys.argv[3]
-download_dir = sys.argv[4]
+title = urllib.unquote(sys.argv[2])
+data = urllib.unquote(sys.argv[3])
+download_dir = urllib.unquote(sys.argv[4])
 #overwrite = sys.argv[5] if len(sys.argv)>5 else False
 
 queue_dir = os.path.join(xbmc.translatePath("special://temp"), "download_queue") if not CLI_MODE else "download_queue"
@@ -54,8 +65,20 @@ if cmd in ["download2", "download3"] and not CLI_MODE:
 
 cur_directory = os.path.dirname(__file__)
 sources_directory = os.path.join(cur_directory,"resources","lib", "content", "sources")
-sources = ContentSources.ContentSources(sources_directory)
-
+#sources = ContentSources.ContentSources(sources_directory)
+#print "[playstream] Create sources objects"
+if use_streams_file_remote:
+    cfg_file = streams_file_remote
+    cfg_file2 = streams_file
+else:
+    cfg_file = streams_file
+    cfg_file2 = None
+try:
+    sources = ContentSources.ContentSources(sources_directory, cfg_file, cfg_file2)
+except Exception as e:
+    #xbmc.executebuiltin("Notification(Error,%s" % e.message)
+    #xbmc.executebuiltin("XBMC.ActivateWindow(Home)")
+    plugin.notify(e.message)
 
 def main():
     if not sources.is_video(data):  # Folderis
@@ -96,8 +119,10 @@ def download_video(title, data, download_dir, overwrite, cb_notify=None, num=Non
         stream = streams[res]
     else:
         stream = streams[0]
-
-    download_stream(stream, download_dir, overwrite, notify, num=num)
+    try:
+        download_stream(stream, download_dir, overwrite, notify, num=num)
+    except Exception as e:
+        notify(e.message, title="Error")
 
     #d = Downloader.download_video(stream["url"], os.path.join(download_dir, output), stream["headers"])
     #reactor.run()
@@ -123,12 +148,14 @@ def notify(text, title="Info", time=10000):
 ####################################################################################################
 
 def download_stream(stream, download_dir, overwrite=True, cb_notify=None, num=False):
+    UA = "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:51.0) Gecko/20100101 Firefox/51.0"
+
     #output =  stream["name"].replace("\\"," ").replace(":"," ").replace("|"," ")
     url = stream["url"]
     title = stream["name"].strip()
     output = file.make_fname(title)
 
-    headers = stream["headers"] if "headers" in stream and stream["headers"] else {"user-agent":"Enigma2"}
+    headers = stream["headers"] if "headers" in stream and stream["headers"] else {"user-agent":UA}
     try:
         h = get_header(url,headers=headers)
         mtype = h.get("content-type")
@@ -327,7 +354,7 @@ def download_hls(url, outputfile, headers=None, overwrite=True, limit=None, cb_n
         progress = float(currentbytes)/float(totalbytes)*100
         msg = "%.1f%% (%iMB/%iMB)"%(progress,currentbytes / 1024 / 1024,totalbytes / 1024 / 1024)
         #print msg
-        #notify(msg)
+        notify(msg)
 
         if type == "vod":
             if ts_num >= len(ts_list) or (limit and currenttime>limit):

kmake.bat

@@ -112,7 +112,7 @@ rm -r -f "%pack_name%"
 
 if not ()==(%1%) (
     git commit -m %ver%
-    git tag -d "%ver%"
+    git tag -d %ver%
     git tag %ver%
     git push