0.6h

ContentSources.py

@@ -6,10 +6,10 @@
 # Distributed under the GNU GPL v3. For full terms see http://www.gnu.org/licenses/gpl-3.0.en.html
 #
 
-import sys,os,re
+import sys, os, re
 import glob, traceback
-sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
-from  sources.SourceBase import stream_type
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from sources.SourceBase import stream_type
 import util
 
 
@@ -24,7 +24,7 @@ class ContentSources(object):
         #for f in os.listdir(plugin_path):
         #for f in next(os.walk(plugin_path))[2]:
         print "ContentSources: Importing sources from "+plugin_path
-        files = glob.glob(os.path.join(plugin_path,"*.py"))
+        files = glob.glob(os.path.join(plugin_path, "*.py"))
         for f in files:
             fname, ext = os.path.splitext(f)
             fname = os.path.split(fname)[1]
@@ -106,15 +106,30 @@ class ContentSources(object):
                     if isinstance(s[k],unicode):
                         s[k] = s[k].encode("utf8")
                 if not "resolver" in s:
-                    s["resolver"] = stream
+                    s["resolver"] = source
                 if not "surl" in s or not s["surl"]:
                     s["surl"] = data
                 if not "nfo" in s:
-                    s["nfo"]={"tvshow":{"title":s["title"],"thumb":s["img"],"plot":s["desc"]}}
+                    s["nfo"]={"movie":{"title":s["name"],"thumb":s["img"],"plot":s["desc"]}}
             return streams
         else:
             return []
 
+    def get_info(self,data):
+        nfo = {}
+        if self.is_video(data):
+            source = data.split("::")[0]
+            if source in self.plugins:
+                if "get_info" in dir(self.plugins[source]):
+                    streams = self.get_streams(data)
+                    nfo = streams[0]["nfo"] if streams and "nfo" in streams[0] else {}
+                else:
+                    nfo = self.plugins[source].get_info(data)
+        else:
+            pass    # TODO create nfo for listing
+        return nfo
+
+
     def stream_type(self,data):
         return stream_type(data)
 

__init__.py

@@ -1,20 +0,0 @@
-from os import environ
-from gettext import bindtextdomain, dgettext, gettext
-
-from Components.Language import language
-from Tools.Directories import resolveFilename, SCOPE_PLUGINS
-
-
-def localeInit():
-    environ["LANGUAGE"] = language.getLanguage()[:2]
-    bindtextdomain("PlayStream", resolveFilename(SCOPE_PLUGINS, "Extensions/PlayStream/locale"))
-
-def _(txt):
-    t = dgettext("PlayStream", txt)
-    if t == txt:
-        t = gettext(txt)
-    return t
-
-localeInit()
-language.addCallback(localeInit)
-

changelog.md

@@ -1,5 +1,18 @@
+**0.6h** (19.03.2017):
+- update pārbaude uzsākot darbu
+- versijas numura  iekļaušana kodā, parādīsana Config logā
+- logu redizains (pogas apakšā konfig logos u.c.)
+- info loga izsaukšana no menu
+- koda safrizēšana/refaktorings (pep8, locale u.c.)
+
+**0.6d** (18.03.2017):
+- Strīma info logs izsaucams no playera (ar bildi un nfo  info)
+- skini iznesti ārā xml failā
+- citi labojumi
+
 **0.6b** (05.03.2017)
-- uzlabota lejupielāde (foldera paprasišana, lejupielāde apakšfolderi u.c.)
+- Config logā pievienota iespēja atjaunināt pluginu (izsauc attiecigas opkg komandas)
+- uzlabota lejupielāde (foldera paprasišana, lejupielāde apakšfolderi, aktivās lejupielādes no Config loga u.c.)
 - .nfo un .jpg failu veidošana pie lejupielādes (jēdzigs .nfo pagaidam tikai iPlayer)
 
 **0.6a** (12.02.2017):

deploy.bat

@@ -14,11 +14,12 @@ if (dm800se)==(%1%) (
 for %%f in (
 __init__.py
 plugin.py
+plugin_locale.py
 plugin.png
+skin.xml
 PlayStream.py
 PlayStream.png
 ContentSources.py
-ChoiceBox.py
 VideoDownload.py
 enigma2_api.py
 resolver.py

get_version.py

@@ -0,0 +1,2 @@
+import re,sys
+print re.search('__version__ = "(.+?)"',open(sys.argv[1]).read()).group(1)

imake.bat

@@ -2,14 +2,13 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.6b
-	rem echo Please provide version
-	rem pause
-	rem GOTO:EOF
+    python get_version.py PlayStream.py >version.txt
+    set /p ver=<version.txt
+    echo Version: %ver%
 ) else (
     set ver=%1
 )
-
+pause
 set prog=PlayStream
 set pack_name=enigma2-plugin-extensions-playstream
 set desc=Play online streams from various sources, mostly Latvian
@@ -32,7 +31,9 @@ readme.md
 changelog.md
 __init__.py
 plugin.py
+plugin_locale.py
 plugin.png
+skin.xml
 %prog%.py
 %prog%.png
 ContentSources.py
@@ -163,6 +164,6 @@ 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 Packages
+gzip -f -k Packages
 popd
 

locale/PlayStream.pot

@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-04-24 16:41+FLE Daylight Time\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-"Generated-By: pygettext.py 1.5\n"
-
-
-#: PlayStream.py:83
-msgid "Back"
-msgstr ""
-
-#: PlayStream.py:84
-msgid "Select"
-msgstr ""
-
-#: plugin.py:16 plugin.py:17
-msgid "Play online streams from various sources"
-msgstr ""
-

locale/lv.po

@@ -4,27 +4,72 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-04-24 16:43+0300\n"
-"PO-Revision-Date: 2016-04-24 16:45+0300\n"
-"Language-Team: \n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-03-18 15:28+FLE Standard Time\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
 "Generated-By: pygettext.py 1.5\n"
-"X-Generator: Poedit 1.8.7\n"
-"Last-Translator: \n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-"Language: lv\n"
 
-#: PlayStream.py:83
-msgid "Back"
-msgstr "Atpakaļ"
 
-#: PlayStream.py:84
+#: PlayStream.py:104 PlayStream.py:1126
+msgid "Exit"
+msgstr "Beigt"
+
+#: PlayStream.py:105 PlayStream.py:1127
 msgid "Select"
-msgstr "Izvēlies"
+msgstr "Izvēle"
+
+#: PlayStream.py:106 PlayStream.py:1128
+msgid "Options"
+msgstr "Opcijas"
+
+#: PlayStream.py:107 PlayStream.py:1129
+msgid "Config"
+msgstr "Konfigurācija"
+
+#: PlayStream.py:555
+msgid ""
+"Sorry, this file already exists:\n"
+"%s"
+msgstr ""
 
-#: plugin.py:16 plugin.py:17
+#: PlayStream.py:933
+msgid "Download folder"
+msgstr ""
+
+#: PlayStream.py:934
+msgid "Overwrite download video"
+msgstr ""
+
+#: PlayStream.py:935
+msgid "TMP folder"
+msgstr ""
+
+#: PlayStream.py:936
+msgid "Clear tmp folder on exit"
+msgstr ""
+
+#: PlayStream.py:937
+msgid "Start playstreamproxy"
+msgstr ""
+
+#: PlayStream.py:941 PlayStream.py:1057
+msgid "Cancel"
+msgstr ""
+
+#: PlayStream.py:942
+msgid "Save"
+msgstr "Saglabāt"
+
+#: PlayStream.py:1016
+msgid "Restart Enigma2?"
+msgstr "Pārstartēt Enigma2"
+
+#: plugin.py:27 plugin.py:28
 msgid "Play online streams from various sources"
-msgstr "Dažādu online plūsmu spēlēšana no dažādiem avotiem"
+msgstr "Rāda interneta strīmus no dažādiem avotiem"
+

locale/plugin.pot

@@ -0,0 +1,75 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-03-18 15:28+FLE Standard Time\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#: PlayStream.py:104 PlayStream.py:1126
+msgid "Exit"
+msgstr ""
+
+#: PlayStream.py:105 PlayStream.py:1127
+msgid "Select"
+msgstr ""
+
+#: PlayStream.py:106 PlayStream.py:1128
+msgid "Options"
+msgstr ""
+
+#: PlayStream.py:107 PlayStream.py:1129
+msgid "Config"
+msgstr ""
+
+#: PlayStream.py:555
+msgid ""
+"Sorry, this file already exists:\n"
+"%s"
+msgstr ""
+
+#: PlayStream.py:933
+msgid "Download folder"
+msgstr ""
+
+#: PlayStream.py:934
+msgid "Overwrite download video"
+msgstr ""
+
+#: PlayStream.py:935
+msgid "TMP folder"
+msgstr ""
+
+#: PlayStream.py:936
+msgid "Clear tmp folder on exit"
+msgstr ""
+
+#: PlayStream.py:937
+msgid "Start playstreamproxy"
+msgstr ""
+
+#: PlayStream.py:941 PlayStream.py:1057
+msgid "Cancel"
+msgstr ""
+
+#: PlayStream.py:942
+msgid "Save"
+msgstr ""
+
+#: PlayStream.py:1016
+msgid "Restart Enigma2?"
+msgstr ""
+
+#: plugin.py:27 plugin.py:28
+msgid "Play online streams from various sources"
+msgstr ""
+

messages.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-04-24 15:59+FLE Daylight Time\n"
+"POT-Creation-Date: 2017-03-18 15:25+FLE Standard Time\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

plugin.py

@@ -1,23 +1,36 @@
+#!/usr/bin/env python
+# coding=utf8
+# This file is part of PlayStream - enigma2 plugin to play video streams from various sources
+# Copyright (c) 2016 ivars777 (ivars777@gmail.com)
+
+import os, traceback
 from Plugins.Plugin import PluginDescriptor
-import PlayStream
-from . import _
-import traceback
+from Components.Language import language
+import PlayStream as plugin
+from plugin_locale import _, locale_init
+
+
+# lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
+# os.environ["LANGUAGE"] = lang # Enigma doesn't set this (or LC_ALL, LC_MESSAGES, LANG). gettext needs it!
+locale_init(plugin.__title__,"locale")
+language.addCallback(locale_init)
 
 def main(session, **kwargs):
     try:
-        reload(PlayStream)
-        session.open(PlayStream.MainScreen)
+        reload(plugin)
+        session.open(plugin.MainScreen)
     except Exception as e:
         print "Error loading PlayStream - "+ e.message
         traceback.print_exc()
 
 def menu(menuid, **kwargs):
     if menuid == "mainmenu":
-        return [("Play Stream", main, "playstream", 57)]
+        return [(plugin.__title__, main, plugin.__id__, 57)]
     return []
 
+
 def Plugins(**kwargs):
     return [
-        PluginDescriptor(name = "Play Stream",description = _("Play online streams from various sources"),where = [PluginDescriptor.WHERE_PLUGINMENU,PluginDescriptor.WHERE_EXTENSIONSMENU], icon = "plugin.png", fnc = main),
-        PluginDescriptor(name="Play Stream", description=_("Play online streams from various sources"), where = [PluginDescriptor.WHERE_MENU], fnc=menu)
+        PluginDescriptor(name = plugin.__title__, description = plugin.__desc__, where = [PluginDescriptor.WHERE_PLUGINMENU,PluginDescriptor.WHERE_EXTENSIONSMENU], icon = "plugin.png", fnc = main),
+        PluginDescriptor(name=plugin.__title__, description = plugin.__desc__, where = [PluginDescriptor.WHERE_MENU], fnc=menu)
     ]

plugin_locale.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+import gettext, os.path
+domain = "Plugin"	# to be redefined
+localedir = "locale" # to be redefinded
+cur_directory = os.path.dirname(os.path.realpath(__file__))
+
+
+def locale_init(domain0=None,localedir0=None):
+    global domain,localedir
+    if domain0:
+        domain = domain0
+    if localedir0:
+        localedir = os.path.join(cur_directory,localedir0)
+    print "Set locale %s to %s"%(domain,localedir)
+    gettext.bindtextdomain(domain, localedir)
+
+
+def _(txt):
+    t = gettext.dgettext(domain, txt)
+    if t == txt:
+        t = gettext.gettext(txt)
+    return t
+
+
+

skin.xml

@@ -0,0 +1,59 @@
+<skin>
+  <screen name="PSMain" position="center,center" size="1015,570" title="Play Stream">
+    <eLabel position="5,0" size="1000,2" backgroundColor="unaaaaaa" />
+    <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">
+                { "template": [MultiContentEntryText(pos=(10, 1), size=(560, 30), font=0, flags=RT_HALIGN_LEFT,
+                text=0)],
+                "fonts": [gFont("Regular", 20)],
+                "itemHeight": 30 }
+            </convert>
+    </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="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" />
+    <widget name="key_green" position="290,535" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="yellow" position="430,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+    <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" />
+    <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">
+    <widget name="title" position="10,10" size="990,50" font="Regular;30" />
+    <widget name="pic" position="10,70" size="330,430" alphatest="on" transparent="1" halign="center" />
+    <widget name="info" position="360,70" size="640,430" halign="left" font="Regular;20" valign="top" />
+    <ePixmap name="red" position="150,510" zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+    <widget name="key_red" position="150,510" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+  </screen>
+  <screen name="PSOptions" position="center,center" size="580,450" title="PlayStream Configuration">
+    <widget name="title" position="10,2" size="560,38" font="Regular;24" />
+    <ePixmap name="red" position="10,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+    <ePixmap name="green" position="150,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
+    <ePixmap name="yellow" position="290,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+    <ePixmap name="blue" position="430,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+    <widget name="key_red" position="10,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="key_green" position="150,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="key_yellow" position="290,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="key_blue" position="430,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="config" position="10,50" size="560,340" scrollbarMode="showOnDemand" />
+</screen>
+  <screen name="PSConfig" position="center,center" size="580,450" title="PlayStream Configuration">
+    <widget name="title" position="10,2" size="560,38" font="Regular;24" />
+    <ePixmap name="red" position="10,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+    <ePixmap name="green" position="150,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
+    <ePixmap name="yellow" position="290,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+    <ePixmap name="blue" position="430,400" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+    <widget name="key_red" position="10,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="key_green" position="150,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="key_yellow" position="290,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="key_blue" position="430,400" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="config" position="10,50" size="560,340" scrollbarMode="showOnDemand" />
+</screen>
+</skin>

sources/SourceBase.py

@@ -70,10 +70,6 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
         ### Normally to be overrided in child class
         return [self.get_info(data)]
 
-    def get_info(self,data):
-        streams = self.get_streams(data)
-        return streams[0] if streams else {}
-
     def options_read(self):
         if not ("options" in dir(self) and self.options): # process options only if self.options defined, self.config_file should be defined too
             return None

sources/cinemalive.py

@@ -162,7 +162,7 @@ Accept-Language: en-US,en;q=0.8
         
         #m = re.search('<div class="viboom-overroll"><iframe src="([^"]+)"', r)
         #if m:
-        result = re.findall('<div id="video_container"><iframe src="(.+?)"', r)
+        result = re.findall('<div id="video_container"><iframe.+?src="(.+?)"', r)
         if result:
             streams = resolve(result[0])
             for s in streams:

sources/filmix.py

@@ -144,7 +144,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 if m:
                     title = title + "/"+m.group(1)
                 m = re.search('<img src="([^"]+.jpg)"', r2, re.DOTALL)
-                img = "http://filmix.me"+m.group(1) if m else self.img
+                img = m.group(1) if m else self.img
                 m = re.search(r'<a itemprop="copyrightYear".+?>(\d+)<', r2, re.DOTALL)
                 if m:
                     year = m.group(1) if m else ""

sources/iplayer.py

@@ -382,7 +382,7 @@ Connection: Keep-Alive
 
             #Create nfo dictionary
             tt = lambda dd,k,d: dd[k] if k in dd else d
-            nfo_type = "tvshow" if True else "movie"
+            nfo_type = "movie" if True else "tvswhow" # TODO
             t = OrderedDict()
             t["title"] = title
             t["originaltitle"] = tt(ep,"original_title","")
@@ -395,7 +395,6 @@ Connection: Keep-Alive
             t["premiered"] = tt(ep,"release_date","")
             t["aired"] = ver["availability"]["start"].split("T")[0] if "start" in ver["availability"] else ""
             if "parent_position" in ep: t["episode"] = ep["parent_position"]
-
             nfo[nfo_type] = t
 
             return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8"),vid.encode("utf8"),nfo

sources/ltc.py

@@ -750,20 +750,62 @@ Host: manstv.lattelecom.tv
             #data2 = self.get_noma_url(video_id)
         r = self.call2(data)
         m = re.search('<meta name="dr:say:title" content="([^"]+)">', r, re.IGNORECASE)
-        if m:
-            title = m.group(1)
-        else:
-            title = ""
-        desc = title
+        nfo = {}
+        tt = lambda p,r,d: re.search(p,r).group(1) if re.search(p,r) else d
+        tt2 = lambda p,r,d: (re.sub("<.+?>","",re.search(p,r).group(1))).split(",") if re.search(p,r) else d
+        r2 = r[r.find('<div class="movie_details">'):]
+        nfo["title"] = tt('<div class="lv">([^<]+)</div>', r2,"")
+        nfo["originaltitle"] = tt('<div class="en">([^<]+)</div>', r2,"")
+        if nfo["originaltitle"] and not nfo["title"]:
+                nfo["title"] = nfo["originaltitle"]
+                #nfo["originaltitle"] = ""
+        if "raidijumi" in data:
+            nfo["set"] = nfo["title"]
+            m = re.search('class="movie_informatio">(.+?)<br>(.+?)<br>', r)
+            ep2,ep1 = m.groups()
+            #nfo["title"]
+            s_nr = tt('<span id="current_season_nr">(\d+)</span>',r,"")
+            for it in  re.findall(r'<span class="epizode_number">(\d+)</span>.+?<span class="titlez">(.+?)</span>', r):
+                if it[1] == ep1:
+                    ep_nr = it[0]
+                    break
+            else:
+                ep_nr=""
+            if s_nr:
+                nfo["season"] = s_nr
+            if ep_nr:
+                nfo["eposode"] = ep_nr
+            se = "S%02i"%int(s_nr) if s_nr else ""
+            se += "E%02i"%int(ep_nr) if ep_nr else ""
+            nfo["title"] += " - %s"%ep1 if ep1 else ""
+            nfo["originaltitle"] += " - %s"%ep2 if ep2 else ""
+            nfo["title"] += "(%s)"%se if se else ""
+            nfo["originaltitle"] += "(%s)"%se if se else ""
+
+
+        nfo["thumb"] = tt('<meta name="og:image" content="([^"]+)"', r,"")
+        nfo["year"] = tt("Gads: ([^<]+)<", r2, "")
+        nfo["runtime"] = tt("Garums: ([^<]+)<", r2, "")
+        nfo["quality"] = tt("Kvalitāte: ([^<]+)<", r2, "")
+        nfo["genre"]=tt2("Žanr.: (.+?)<br", r2, "")
+        nfo["director"] = tt("Režisors: ([^<]+)<", r2, "")
+        nfo["actor"] = tt2("Lomās: ([^<]+)<", r2, "")
+        nfo["language"] = tt2("Valodas: ([^<]+)<", r2, "")
+        nfo["subtitles"] = tt2("Subtitri: ([^<]+)<", r2, "")
+        nfo["plot"] = tt('"introduction">(.+?)<', r2,"")
+        nfo["tagline"] = nfo["plot"]
+        title = util.nfo2title(nfo)
+        desc = util.nfo2desc(nfo)
+        img = nfo["thumb"]
+        #xml = util.nfo2xml(nfo)
 
         url = "https://www.lattelecom.tv/xmls/%s.xml"%video_id
         headers = self.headers2
         headers["Cookie"] = self.session_id
         response = urllib2.urlopen(urllib2.Request(url, headers=headers))
-
         r = response.read()
         servers = re.findall("(?s)<origin>([^<]+)</origin>", r)
-        streams_xml = re.findall('<stream quality="\w+">(mp4:\w+_(\w\w)_(\w\w).mp4)</stream>',r)
+        streams_xml = re.findall('<stream quality="\w+">(mp4:\w+(\w\w)_(\w\w).mp4)</stream>',r)
         resource_id = re.search("(?s)<resource_id>([^<]+)</resource_id>", r).group(1)
         token = re.search("(?s)<auth_token>([^<]+)</auth_token>", r).group(1)
         streams=[]
@@ -788,6 +830,8 @@ Host: manstv.lattelecom.tv
                 stream["quality"]=s[2]
                 stream["name"]=title
                 stream["desc"]=desc
+                stream["img"] = img
+                stream["nfo"] = {"movie":nfo}
                 stream["type"]="hls" #stream_type(url)
                 stream["subs"] = []
                 for c in captions:

util.py

@@ -57,6 +57,62 @@ def system():
     else:
         return "unknown"
 
+def nfo2xml(nfo_dict):
+    nfo_type,nfo = next(nfo_dict.iteritems())
+    s= "<%s>\n"%nfo_type.encode("utf8")
+    for k,v in nfo.iteritems():
+        if isinstance(v,list):
+            for v2 in v:
+                if isinstance(v2,unicode): v2 = v2.encode("utf8")
+                s += "    <%s>%s</%s>\n"%(k.encode("utf8"), v2, k.encode("utf8"))
+        else:
+            if isinstance(v,unicode): v = v.encode("utf8")
+            s += "    <%s>%s</%s>\n"%(k.encode("utf8"), v, k.encode("utf8"))
+    s += "</%s>\n"%nfo_type.encode("utf8")
+    return s
+
+def nfo2desc(nfo):
+
+    if not "title" in nfo:
+        nfo_type, nfo = next(nfo.iteritems())
+    desc = nfo2title(nfo)
+    dd = lambda t: "\n" + nfo[t] if t in nfo and nfo[t] else ""
+    dd2 = lambda t: "\n" + ",".join(nfo[t]) if t in nfo and nfo[t] else ""
+
+    def ddd(t,title=""):
+        if title:
+            title = title + ": "
+        if t in nfo and nfo[t]:
+            if isinstance(nfo[t],list):
+                return "\n" + title + ",".join(nfo[t])
+            else:
+                return "\n" + title + nfo[t]
+        else:
+            return ""
+
+    desc += ddd("tagline")
+    if "plot" in nfo and "tagline" in nfo and nfo["tagline"] <> nfo["plot"]:
+        desc += ddd("plot")
+    elif "plot" in nfo and not "tagline" in nfo:
+        desc += ddd("plot")
+    desc += ddd("genre","Genre")
+    desc += ddd("runtime","Length")
+    desc += ddd("director","Director")
+    desc += ddd("actor","Actors")
+    desc += ddd("language","Languages")
+    desc += ddd("quality","Quality")
+    return desc.encode("utf8")
+
+def nfo2title(nfo):
+    if not "title" in nfo:
+        nfo_type, nfo = next(nfo.iteritems())
+    title = nfo["title"]
+    if "originaltitle" in nfo and nfo["originaltitle"] and nfo["originaltitle"]<>nfo["title"]:
+        title +=" ~ "+nfo["originaltitle"]
+    if "year" in nfo and nfo["year"]:
+        title += " (%s)"%nfo["year"]
+    return title.encode("utf8")
+
 def play_video(streams):
     if len(streams)>1:
         for i,s in enumerate(streams):
@@ -75,7 +131,9 @@ def play_video(streams):
         stream = streams[0]
 
     stream = stream_change(stream)
-    title = stream["name"]
+    title = stream["name"] if not "nfo" in stream else nfo2title(stream["nfo"])
+    desc = stream["desc"] if not "nfo" in stream else nfo2desc(stream["nfo"])
+    img = stream["img"]
     url = stream["url"]
     suburl = ""
     print url
@@ -93,11 +151,11 @@ def play_video(streams):
                 f.write(subs)
         else:
             print "\n Error downloading subtitle %s"%suburl
-    return player(url,stream["name"],suburl,stream["headers"])
+    print "\n**Play stream %s\n%s" % (title, url.encode("utf8"))
+    return player(url,title,suburl,stream["headers"])
 
-def player(url,title="",suburl="",headers={}):
+def player(url, title = "", suburl= "",headers={}):
     from subprocess import call
-    print "\n**Play stream %s\n%s"%(title,url.encode("utf8"))
     cmd1 = [r"c:\Program Files\VideoLAN\VLC\vlc.exe",url,
            "--meta-title",title.decode("utf8").encode(sys.getfilesystemencoding()),
            "--http-user-agent","Enigma2"
@@ -118,6 +176,16 @@ def player(url,title="",suburl="",headers={}):
         #a = raw_input("*** Error, continue")
     return
 
+def check_version(package,url="http://feed.blue.lv/Packages"):
+    "Return current package version from OPKG feed"
+    url = "http://feed.blue.lv/Packages"
+    r = requests.get(url)
+    if not r.ok:
+        return ""
+    m = re.search("Package: %s\nVersion: (.+?)\n"%package, r.content)
+    if not m:
+        return ""
+    return m.group(1)
 
 SPLIT_CHAR = "~"
 SPLIT_CODE = urllib.quote(SPLIT_CHAR)

xgetttext.bat

@@ -1,2 +1,3 @@
 set program=PlayStream
-pygettext.py -p locale -o %program%.pot -p locale %program%.py plugin.py
+set pygettext=c:\Python27\Tools\i18n\pygettext.py
+python %pygettext% -p locale -o plugin.pot plugin.py %program%.py