0.7o

PlayStream.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # coding=utf8
-# This file is part of PlayStream - enigma2 plugin to play video streams from various sources
+# This file is part of PlayStream - enigma2 plughhhhin to play video streams from various sources
 # Copyright (c) 2016 ivars777 (ivars777@gmail.com)
 # Distributed under the GNU GPL v3. For full terms see http://www.gnu.org/licenses/gpl-3.0.en.html
 # Used fragments of code from enigma2-plugin-tv3play by Taapat (https://github.com/Taapat/enigma2-plugin-tv3play)
 #
 
-__version__ = "0.7e"
+__version__ = "0.7o"
 __id__ = "playstream"
 __title__ = "PlayStream"
 __author__ = "ivars777@gmail.com"
@@ -49,12 +49,18 @@ from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 from Tools.LoadPixmap import LoadPixmap
 from skin import loadSkin
 from twisted.web.client import downloadPage,defer,reactor
+try:
+    # available since twisted 14.0
+    from twisted.internet._sslverify import ClientTLSOptions
+except ImportError:
+    ClientTLSOptions = None
+from twisted.internet.ssl import ClientContextFactory
 
 from plugin_locale import _
-import ContentSources
-import util
+from content import ContentSources
+from content import util
 from VideoDownload import DownloadJob, HLSDownloadJob,VideoDownloadList
-from Downloader import get_header, get_ext
+from content.Downloader import get_header, get_ext
 #import enigma2_api
 
 e2 = None
@@ -72,6 +78,16 @@ config.plugins.playstream.overwrite_download = ConfigYesNo(default = False)
 config.plugins.playstream.clear_tmp = ConfigYesNo(default = True)
 config.plugins.playstream.check_update = ConfigYesNo(default = True)
 
+
+class CustomContextFactory(ClientContextFactory):
+    def __init__(self, hostname = None):
+        self.hostname = hostname
+    def getContext(self):
+        ctx = self._contextFactory(self.method)
+        if self.hostname and ClientTLSOptions:
+            ClientTLSOptions(self.hostname, ctx)
+        return ctx
+
 #####################################################################################################################
 class MainScreen(Screen):
     def __init__(self, session):
@@ -129,7 +145,7 @@ class MainScreen(Screen):
         self.history = []
 
         reload(ContentSources)
-        self.sources = ContentSources.ContentSources(os.path.join(cur_directory,"sources"))
+        self.sources = ContentSources.ContentSources(os.path.join(cur_directory, "content", "sources"))
         self.config = self.sources.plugins["config"]
         self.cur_menu = ("Home","config::home","","Sākums") #
         self.content = self.sources.get_content(self.cur_menu[1])
@@ -195,7 +211,7 @@ class MainScreen(Screen):
                 image_path = os.path.join(config.plugins.playstream.tmp_dir.value, fname)
                 self.download_image(image_path, image_url)
             else: # local file
-                image_path = os.path.join(cur_directory,image_url)
+                image_path = os.path.join(cur_directory, "picons", image_url)
                 self.start_decode(image_path,image_url)
 
     def start_decode(self,image_path,image_url):
@@ -204,11 +220,14 @@ class MainScreen(Screen):
         sc = AVSwitch().getFramebufferScale()
         if  not self.picloads.has_key(image_path):
             self.picloads[image_path] = ePicLoad()
-            self.picloads[image_path].PictureData.get().append(boundFunction(self.decode_finished, image_path))
+            try:
+                self.picloads[image_path].PictureData.get().append(boundFunction(self.decode_finished, image_path))
+            except:
+                self.picloads[image_path].PictureData.connect(boundFunction(self.decode_finished, image_path))
             self.picloads[image_path].setPara((self["pic"].instance.size().width(),
                                           self["pic"].instance.size().height(),
                                           sc[0], sc[1], True, 0, "#00000000"))
-            #print image_path,image_url
+            print image_path,image_url
             self.picloads[image_path].startDecode(image_path)
 
     def decode_finished(self, image_path, picInfo = None):
@@ -230,7 +249,7 @@ class MainScreen(Screen):
         #print "Image download started",self.downloading,image_path,image_url
         self.downloading += 1
         self.images[image_url] = -1
-        downloadPage(image_url, image_path).addCallback(boundFunction(self.download_image_finished, image_path, image_url)).addErrback(boundFunction(self.download_image_failed, image_path, image_url))
+        downloadPage(image_url, image_path, CustomContextFactory(image_url.split("/")[2])).addCallback(boundFunction(self.download_image_finished, image_path, image_url)).addErrback(boundFunction(self.download_image_failed, image_path, image_url))
 
     def download_image_finished(self, image_path, image_url, result):
         self.downloading -= 1
@@ -311,7 +330,7 @@ class MainScreen(Screen):
         data = self.current[1]
         source = data.split("::")[0]
         if self.sources.is_video(data) and "get_info" in dir(self.sources.plugins[source]):
-            self.sources.plugins
+            #self.sources.plugins
             try:
                 nfo = self.sources.get_info(self.current[1])
             except Exception, e:
@@ -344,8 +363,11 @@ class MainScreen(Screen):
             self.show_content(new_content)
 
     def back(self):
-        self["list"].setIndex(0)
-        self.ok()
+        if self.history:
+            self["list"].setIndex(0)
+            self.ok()
+        else:
+            self.cancel()
 
     def show_content(self,content,index=0):
         self["list"].setList(content)
@@ -1168,7 +1190,7 @@ class StreamInfo(Screen):
             fname = image_url.replace(":", "-").replace("/", "_")
             image_path = os.path.join(config.plugins.playstream.tmp_dir.value, fname)
             if not os.path.exists(image_path):
-                downloadPage(image_url, image_path).addCallback(boundFunction(self.download_finished, image_path,image_url)).addErrback(boundFunction(self.download_failed, image_path,image_url))
+                downloadPage(image_url, image_path, CustomContextFactory(image_url.split("/")[2])).addCallback(boundFunction(self.download_finished, image_path,image_url)).addErrback(boundFunction(self.download_failed, image_path,image_url))
             else:
                 self.download_finished(image_path, image_url)
         elif image_url:
@@ -1178,7 +1200,10 @@ class StreamInfo(Screen):
     def download_finished(self, image_path,image_url):
         sc = AVSwitch().getFramebufferScale()
         self.picloads = ePicLoad()
-        self.picloads.PictureData.get().append(boundFunction(self.finish_decode, image_path))
+        try:
+            self.picloads.PictureData.get().append(boundFunction(self.finish_decode, image_path))
+        except:
+            self.picloads.PictureData.connect(boundFunction(self.finish_decode, image_path))
         # 0=Width 1=Height 2=Aspect 3=use_cache 4=resize_type 5=Background(#AARRGGBB)
         self.picloads.setPara((self["pic"].instance.size().width(), self["pic"].instance.size().height(),
                                sc[0], sc[1], True, 0, "#00000000"))

VideoDownload.py

@@ -10,8 +10,7 @@ from Components.Task import Task, Job, job_manager
 from Screens.Screen import Screen
 from Tools.Directories import fileExists
 
-from Downloader import DownloadWithProgress, DownloadWithProgressFragmented,get_header
-
+from content.Downloader import DownloadWithProgress, DownloadWithProgressFragmented,get_header
 
 def timer_callback(timer,callback):
     if "callback" in dir(timer):

changelog.md

@@ -1,7 +1,46 @@
+**0.7o** (10.12.2017)
+- [change] salabots ltc search
+- [change] salabots filmix search
+- [change] salabots mtgplay (tvplay) search un sortēšana
+- [change] salabots cinemalive get_video
+- u.c.
+
+**0.7n** (14.11.2017)
+- [change] salabots ltc (shortuc.lv)
+
+**0.7m** (14.10.2017)
+- [bugfix] lmt -  attēlus nerādīja
+- [bugifx] mtgplay (skaties.lv) - papildus pārbaudes, ja nav raidījuma attēlu
+
+**0.7l** (11.10.2017)
+- [change] Izeja no plugina ar Exit esot sākuma logā
+
+**0.7k** (11.10.2017)
+- [bugfix] TLSOptions nav Twisted versijām <14.0
+- [bugfix] PictureData savietojamība ar openenigma (get->connect)
+
+**0.7j** (11.10.2017)
+- [bugfix] key_exit un key_menu png faili iekļauti instalācijā
+
+**0.7i** (10.10.2017)
+- [bugfix] cinemalive.lv bilžu downloads (custom ClientContextFactory)
+- [change] replay info sakārtošana
+- [bugfix] skin.xml neesošās krasas un png
+
+**0.7h** (07.10.2017)
+- [change] Salabots cinemalive (strādā gan openload, gan cloudsany)
+
+**0.7g** (04.10.2017)
+- [change] Salaboti ltc,filmix,cinemalive u.c.
+
+**0.7f** (13.09.2017)
+- [change] Avoti iznesti atsevišķā folderī/git projektā
+- [change] Sakārtots stream.cfg (bildes u.c.)
+- [change] ltc tv info update
+
 **0.7e** (13.09.2017)
 - [bugfix] Salabots lattelecom.tv (bija pamainīts web formāts)
 
-
 **0.7c** (03.09.2017)
 - [bugfix] Salabots filmix (pamainīts direct url avots uz html5 + dekodēšana kods)
 

deploy.bat

@@ -19,18 +19,20 @@ plugin.png
 skin.xml
 PlayStream.py
 PlayStream.png
-ContentSources.py
 VideoDownload.py
-Downloader.py
 enigma2_api.py
-resolver.py
-util.py
-playstreamproxy.py
-offline.mp4
-sources\*.py
-resolvers\*.py
-picons\*
+content\__ini__.py
+content\ContentSources.py
+content\resolver.py
+content\util.py
+content\run.py
+content\Downloader.py
+content\playstreamproxy.py
+content\offline.mp4
+content\demjson.py
+content\sources\*.py
+content\resolvers\*.py
 locale\*
 ) do echo f | xcopy /y  %%f %TARGET%%%f
-
+xcopy /y /q content\picons\* %TARGET%picons\
 pause

deploy_ipk.bat

@@ -1,6 +1,8 @@
 @echo off
 set dm=dm800se
 set pname=enigma2-plugin-extensions-playstream_
+set /p ver=<version.txt
+
 if (dm800se)==(%1%) (
 	set TARGET=v:\tmp
 ) else if (dm500hd)==(%1%) (
@@ -11,6 +13,6 @@ if (dm800se)==(%1%) (
 	GOTO:EOF
 )
 
-xcopy /y  release\%pname%%2.ipk %TARGET%\
+xcopy /y  release\%pname%%ver%.ipk %TARGET%\
 
 pause

imake.bat

@@ -1,13 +1,22 @@
 @echo off
+
+:--- Pull content submodule ---
+rem cd content
+rem git checkout .
+rem git pull
+rem cd ..
+
 :=== Parameters ===
 
+:--- Extract version number ---
 python get_version.py PlayStream.py >version.txt
 cat version.txt
-pause
+rem pause
 set /p ver=<version.txt
 echo Version: %ver%
-
 pause
+
+:--- Set variables ---
 set prog=PlayStream
 set pack_name=enigma2-plugin-extensions-playstream
 set desc=Play online streams from various sources, mostly Latvian
@@ -22,9 +31,10 @@ set feed_dir=q:\web\feed\
 set AR=\MinGW\bin\ar.exe
 set TAR=\MinGW\msys\1.0\bin\tar.exe
 
-:=== data files ===
+:=== Create data files ===
 if exist %ipk_dir% rm -r -f %ipk_dir%
 mkdir %ipk_dir%
+
 for %%f in (
 readme.md
 changelog.md
@@ -35,50 +45,55 @@ plugin.png
 skin.xml
 %prog%.py
 %prog%.png
-ContentSources.py
+key_menu.png
+key_exit.png
 VideoDownload.py
-Downloader.py
 enigma2_api.py
-resolver.py
-util.py
-playstreamproxy.py
-offline.mp4
-demjson.py
+content\__init__.py
+content\ContentSources.py
+content\Downloader.py
+content\resolver.py
+content\util.py
+content\icon.gif
+content\run.py
+content\playstreamproxy.py
+content\offline.mp4
+content\demjson.py
+content\sources\__init__.py
+content\sources\SourceBase.py
+content\sources\cinemalive.py
+content\sources\config.py
+content\sources\euronews.py
+content\sources\filmix.py
+content\sources\filmon.py
+content\sources\iplayer.py
+content\sources\kinofilmnet.py
+content\sources\movieplace.py
+content\sources\ltc.py
+content\sources\mtgplay.py
+content\sources\play24.py
+content\sources\replay.py
+content\sources\lmt.py
+content\sources\serialguru.py
+content\sources\tvdom.py
+content\sources\ustvnow.py
+content\sources\viaplay.py
+content\sources\YouTubeVideoUrl.py
+content\sources\jsinterp.py
+content\sources\swfinterp.py
+content\sources\streams.cfg
+content\resolvers\__init__.py
+content\resolvers\aadecode.py
+content\resolvers\hqqresolver.py
+content\resolvers\openload3.py
+content\resolvers\hdgo.py
+content\resolvers\kapnob.py
+content\resolvers\kodik.py
+content\resolvers\cloudsany.py
+content\resolvers\youtuberesolver.py
 locale\*.*
-sources\__init__.py
-sources\SourceBase.py
-sources\cinemalive.py
-sources\config.py
-sources\euronews.py
-sources\filmix.py
-sources\filmon.py
-sources\iplayer.py
-sources\kinofilmnet.py
-sources\movieplace.py
-sources\ltc.py
-sources\mtgplay.py
-sources\play24.py
-sources\replay.py
-sources\lmt.py
-sources\serialguru.py
-sources\tvdom.py
-sources\ustvnow.py
-sources\viaplay.py
-sources\YouTubeVideoUrl.py
-sources\jsinterp.py
-sources\swfinterp.py
-sources\streams.cfg
-resolvers\__init__.py
-resolvers\aadecode.py
-resolvers\hqqresolver.py
-resolvers\openload3.py
-resolvers\hdgo.py
-resolvers\kapnob.py
-resolver\kodik.py
-resolvers\youtuberesolver.py
-picons\*.*
 ) do echo f | xcopy /y /q %%f %ipk_dir%data\%ext_dir%%prog%\%%f
-
+xcopy /y /q content\picons\* %ipk_dir%data\%ext_dir%%prog%\picons\
 xcopy /y /q playstreamproxy %ipk_dir%data\etc\init.d\
 
 :=== control file ===
@@ -102,11 +117,15 @@ dos2unix %ipk_dir%CONTROL\control
 :=== preinst file ===
 (
 echo #!/bin/sh
-:echo if [ -d %ext_dir2%%prog% ]; then
-:echo   rm -rf %ext_dir2%%prog%/* ^> /dev/null 2^>^&1
-:echo   rm -rf %ext_dir2%%prog%/sources/*.py* ^> /dev/null 2^>^&1
-:echo   rm -rf %ext_dir2%%prog%/resolvers/*.py* ^> /dev/null 2^>^&1
-:echo fi
+echo if [ -d %ext_dir2%%prog%/sources ]; then
+echo    rm -rf %ext_dir2%%prog%/*.pyo ^> /dev/null 2^>^&1
+echo    rm -rf %ext_dir2%%prog%/resolvers ^> /dev/null 2^>^&1
+echo    mkdir %ext_dir2%%prog%/content
+echo    mkdir %ext_dir2%%prog%/content/sources
+echo    mv %ext_dir2%%prog%/sources/streams.cfg %ext_dir2%%prog%/content/sources/streams.cfg.old
+echo    mv %ext_dir2%%prog%/sources/*.cfg %ext_dir2%%prog%/content/sources/
+echo    rm -rf %ext_dir2%%prog%/sources ^> /dev/null 2^>^&1
+echo fi
 echo if [ -e /etc/init.d/playstreamproxy ]; then
 echo   rm /etc/init.d/playstreamproxy ^> /dev/null 2^>^&1
 echo fi
@@ -121,6 +140,10 @@ echo chmod +x /etc/init.d/playstreamproxy
 echo ln -s /etc/init.d/playstreamproxy /etc/rc4.d/S50playstreamproxy
 echo ln -s /etc/init.d/playstreamproxy /etc/rc3.d/S50playstreamproxy
 echo ln -s /etc/init.d/playstreamproxy /usr/bin/playstreamproxy
+echo   rm -rf %ext_dir2%%prog%/*.pyo ^> /dev/null 2^>^&1
+echo   rm -rf %ext_dir2%%prog%/content/sources/*.pyo ^> /dev/null 2^>^&1
+echo   rm -rf %ext_dir2%%prog%/content/resolvers/*.pyo ^> /dev/null 2^>^&1
+
 echo exit 0
 ) >%ipk_dir%CONTROL\postinst
 dos2unix %ipk_dir%CONTROL\postinst
@@ -128,16 +151,16 @@ dos2unix %ipk_dir%CONTROL\postinst
 :=== postrm file ===
 (
 echo #!/bin/sh
-:echo if [ -e /etc/rc4.d/S50playstreamproxy ]; then
+rem echo if [ -e /etc/rc4.d/S50playstreamproxy ]; then
 echo   rm /etc/rc4.d/S50playstreamproxy ^> /dev/null 2^>^&1
-:echo fi
+rem echo fi
 echo #!/bin/sh
-:echo if [ -e /etc/rc3.d/S50playstreamproxy ]; then
+rem echo if [ -e /etc/rc3.d/S50playstreamproxy ]; then
 echo   rm /etc/rc3.d/S50playstreamproxy ^> /dev/null 2^>^&1
-:echo fi
-:echo if [ -e /usr/bin/playstreamproxyy ]; then
+rem echo fi
+rem echo if [ -e /usr/bin/playstreamproxyy ]; then
 echo  rm /usr/bin/playstreamproxy ^> /dev/null 2^>^&1
-:echo fi
+rem echo fi
 echo if [ -e /etc/init.d/playstreamproxy ]; then
 echo   rm /etc/init.d/playstreamproxy ^> /dev/null 2^>^&1
 echo fi
@@ -147,7 +170,7 @@ dos2unix %ipk_dir%CONTROL\postrm
 
 :=== conffiles file ===
 (
-echo %ext_dir2%%prog%/sources/streams.cfg
+echo %ext_dir2%%prog%/content/sources/streams.cfg
 ) >%ipk_dir%CONTROL\conffiles
 dos2unix %ipk_dir%CONTROL\conffiles
 
@@ -160,17 +183,20 @@ if exist %release_dir%%pack_name%_%ver%.ipk del %release_dir%%pack_name%_%ver%.i
 @echo on
 mv %release_dir%%pack_name%_%ver% %release_dir%%pack_name%_%ver%.ipk
 
+
 git add %release_dir%%pack_name%_%ver%.ipk
-if not ()==(%1%) (
-git commit -m %ver%
-git tag %ver%
-git push
-)
 
-copy %release_dir%%pack_name%_%ver%.ipk %feed_dir%%pack_name%_%ver%.ipk
-pushd  %feed_dir%
-python c:\Python27\Scripts\opkg-make-index . >Packages
-dos2unix Packages
-gzip -f -k Packages
-popd
+:=== Commit/push and copy to feed if message given ===
+if not ()==(%1%) (
+    git commit -m "%1%"
+    git tag -d "%ver%"
+    git tag "%ver%"
+    git push origin master
 
+    copy %release_dir%%pack_name%_%ver%.ipk %feed_dir%%pack_name%_%ver%.ipk
+    pushd  %feed_dir%
+    python c:\Python27\Scripts\opkg-make-index . >Packages
+    dos2unix Packages
+    gzip -f -k Packages
+    popd
+)

playstreamproxy

@@ -1,9 +1,9 @@
 #!/bin/sh
-DAEMON=/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/playstreamproxy.py 
-NAME=streamproxy
-DESC="StreamProxy"
+DAEMON=/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/content/playstreamproxy.py
+NAME=playstreamproxy
+DESC="PlasyStreamProxy"
 
 test -f $DAEMON || exit 0
 
 /usr/bin/python $DAEMON $1
-exit 0 
+exit 0

playstreamproxy.bat

@@ -1 +0,0 @@
-python playstreamproxy.py manualstart

skin.xml

@@ -1,6 +1,6 @@
 <skin>
   <screen name="PSMain" position="center,center" size="1015,570" title="Play Stream">
-    <eLabel position="5,0" size="1000,2" backgroundColor="unaaaaaa" />
+    <eLabel position="5,0" size="1000,2" backgroundColor="#00aaaaaa" />
     <widget name="title" position="10,2" size="1000,38" font="Regular;30" />
     <widget source="list" render="Listbox" position="10,55" size="580,470" scrollbarMode="showOnDemand">
       <convert type="TemplatedMultiContent">
@@ -12,8 +12,8 @@
     </widget>
     <widget name="pic" position="646,55" size="327,250" alphatest="on" />
     <widget name="cur" position="610,300" size="400,250" halign="center" font="Regular;20" />
-    <ePixmap name="exit" position="10,540" zPosition="2" size="140,40" pixmap="skin_default/buttons/key_exit.png" transparent="1" alphatest="on" />
-    <widget name="key_exit" position="10,535" size="140,40" valign="center" halign="center" zPosition="4" backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="exit" position="10,540" zPosition="2" size="140,40" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/key_exit.png" transparent="1" alphatest="on" />
+    <widget name="key_exit" position="50,535" size="100,40" valign="center" halign="center" zPosition="4" backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
     <ePixmap name="red" position="150,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
     <widget name="key_red" position="150,535" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
     <ePixmap name="green" position="290,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
@@ -22,7 +22,7 @@
     <widget name="key_yellow" position="430,535" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
     <ePixmap name="blue" position="570,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
     <widget name="key_blue" position="570,535" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="menu" position="750,540" zPosition="2" size="140,40" pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
+    <ePixmap name="menu" position="750,540" zPosition="2" size="140,40" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/key_menu.png" transparent="1" alphatest="on" />
     <widget name="key_menu" position="750,535" size="140,40" valign="center" halign="center" zPosition="4" backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
   </screen>
   <screen name="PSStreamInfo" position="center,center" size="1015,570" title="Stream information">