Salabots TVPlay

PlayStream.py

 # Used fragments of code from enigma2-plugin-tv3play by Taapat (https://github.com/Taapat/enigma2-plugin-tv3play)
 #
 
-__version__ = "0.7u"
+__version__ = "0.8r"
 __id__ = "playstream"
 __title__ = "PlayStream"
 __author__ = "ivars777@gmail.com"

PlayStream.wpr

         None,
         1,
         0)},
-                     loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'): {1106L: (0,
+                     loc('../../../../Python27/lib/site-packages/twisted/internet/_sslverify.py'): {1106L: (0,
         None,
         1,
         0)}}
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': False,
         'tree-states': {'deep': {'expanded-nodes': [],
-                                 'selected-nodes': [(96,)],
+                                 'selected-nodes': [(0,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('browser',
         'top-node': [('function def',
                       loc('../../../../Python25/Lib/struct.py'),
                       'calcsize')]},
-        loc('../../../../Python27/Lib/BaseHTTPServer.py'): {'expanded-nodes': [],
+        loc('../../../../Python27/lib/BaseHTTPServer.py'): {'expanded-nodes': [],
         'selected-nodes': [],
         'top-node': [('class def',
-                      loc('../../../../Python27/Lib/BaseHTTPServer.py'),
+                      loc('../../../../Python27/lib/BaseHTTPServer.py'),
                       'BaseHTTPRequestHandler')]},
-        loc('../../../../Python27/Lib/ConfigParser.py'): {'expanded-nodes': [],
+        loc('../../../../Python27/lib/ConfigParser.py'): {'expanded-nodes': [],
         'selected-nodes': [],
         'top-node': [('class def',
-                      loc('../../../../Python27/Lib/ConfigParser.py'),
+                      loc('../../../../Python27/lib/ConfigParser.py'),
                       'ConfigParser')]},
-        loc('../../../../Python27/Lib/site-packages/psycopg2/extras.py'): {'e'\
+        loc('../../../../Python27/lib/site-packages/psycopg2/extras.py'): {'e'\
         'xpanded-nodes': [],
         'selected-nodes': [],
         'top-node': [('class def',
-                      loc('../../../../Python27/Lib/site-packages/psycopg2/extras.py'),
+                      loc('../../../../Python27/lib/site-packages/psycopg2/extras.py'),
                       'CompositeCaster')]},
-        loc('../../../../Python27/Lib/site-packages/win32com/client/dynamic.py'): {'e'\
+        loc('../../../../Python27/lib/site-packages/win32com/client/dynamic.py'): {'e'\
         'xpanded-nodes': [],
         'selected-nodes': [],
         'top-node': [('generic attribute',
-                      loc('../../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
+                      loc('../../../../Python27/lib/site-packages/win32com/client/dynamic.py'),
                       'ALL_INVOKE_TYPES')]},
-        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #2'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #1'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #2'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #1'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
                        'toolbox-percent': 1.0,
                        'toolbox-tree-sel': ''})],
         'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('PlayStream.py'),
-        {'attrib-starts': [('MainScreen',
-                            93),
-                           ('MainScreen.layout_finished',
-                            133)],
-         'first-line': 149L,
+        {'attrib-starts': [('ConfigScreen',
+                            1053)],
+         'first-line': 1044L,
          'folded-linenos': [303L],
-         'sel-line': 159L,
-         'sel-line-start': 7486L,
-         'selection_end': 7506L,
-         'selection_start': 7506L,
+         'sel-line': 1053L,
+         'sel-line-start': 44495L,
+         'selection_end': 44513L,
+         'selection_start': 44501L,
          'zoom': 0L},
-        1520765029.276],
-        [loc('PlayStream.py'),
-         {'attrib-starts': [('ConfigScreen',
-                             1053),
-                            ('ConfigScreen.select_tmp_dir',
-                             1115)],
-          'first-line': 1094L,
-          'folded-linenos': [303L],
-          'sel-line': 1120L,
-          'sel-line-start': 48248L,
-          'selection_end': 48279L,
-          'selection_start': 48279L,
-          'zoom': 0L},
-         1520765145.141],
-        [loc('PlayStream.py'),
-         {'attrib-starts': [('ConfigScreen',
-                             1053)],
-          'first-line': 1044L,
-          'folded-linenos': [303L],
-          'sel-line': 1053L,
-          'sel-line-start': 44495L,
-          'selection_end': 44513L,
-          'selection_start': 44501L,
-          'zoom': 0L},
-         1520765193.281],
+        1520765193.281],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
           'selection_end': 420L,
           'selection_start': 420L,
           'zoom': 0L},
-         1520767034.408]],
+         1520767034.408],
+        [loc('changelog.md'),
+         {'attrib-starts': [],
+          'first-line': 6L,
+          'folded-linenos': [],
+          'sel-line': 18L,
+          'sel-line-start': 489L,
+          'selection_end': 529L,
+          'selection_start': 529L,
+          'zoom': 0L},
+         1528028015.673],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [],
+          'first-line': 0L,
+          'folded-linenos': [303L],
+          'sel-line': 8L,
+          'sel-line-start': 401L,
+          'selection_end': 420L,
+          'selection_start': 420L,
+          'zoom': 0L},
+         1528028021.646]],
         20),
-        'current-loc': loc('changelog.md'),
+        'current-loc': loc('PlayStream.py'),
         'editor-state-list': [(loc('changelog.md'),
                                {'attrib-starts': [],
-                                'first-line': 0L,
+                                'first-line': 6L,
                                 'folded-linenos': [],
-                                'sel-line': 4L,
-                                'sel-line-start': 197L,
-                                'selection_end': 197L,
-                                'selection_start': 197L,
+                                'sel-line': 18L,
+                                'sel-line-start': 489L,
+                                'selection_end': 529L,
+                                'selection_start': 529L,
                                 'zoom': 0L}),
                               (loc('plugin.py'),
                                {'attrib-starts': [],
                                 'selection_start': 203L,
                                 'zoom': 0L}),
                               (loc('PlayStream.py'),
-                               {'attrib-starts': [],
-                                'first-line': 0L,
+                               {'attrib-starts': [('MainScreen',
+        93),
+        ('MainScreen.download_stream',
+         593)],
+                                'first-line': 598L,
                                 'folded-linenos': [303L],
-                                'sel-line': 8L,
-                                'sel-line-start': 401L,
-                                'selection_end': 420L,
-                                'selection_start': 420L,
+                                'sel-line': 607L,
+                                'sel-line-start': 27166L,
+                                'selection_end': 27207L,
+                                'selection_start': 27207L,
                                 'zoom': 0L}),
                               (loc('VideoDownload.py'),
                                {'attrib-starts': [('VideoDownloadList',
          loc('content/sources/config.py'),
          loc('content/ContentSources.py')]),
                                'open_files': [u'VideoDownload.py',
-        u'imake.bat',
-        u'../python/enigma.py',
-        u'plugin.py',
         u'content/ContentSources.py',
         u'content/sources/config.py',
-        u'PlayStream.py',
-        u'changelog.md']},
+        u'imake.bat',
+        u'plugin.py',
+        u'../python/enigma.py',
+        u'changelog.md',
+        u'PlayStream.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.4733405875952122},
         'splits': 2,
                          0,
                          1880,
                          1100)}]}
-guimgr.recent-documents = [loc('changelog.md'),
-                           loc('PlayStream.py'),
+guimgr.recent-documents = [loc('PlayStream.py'),
+                           loc('changelog.md'),
+                           loc('../python/enigma.py'),
                            loc('content/sources/config.py'),
                            loc('content/ContentSources.py'),
                            loc('plugin.py'),
                            loc('VideoDownload.py'),
-                           loc('imake.bat'),
-                           loc('../python/enigma.py')]
+                           loc('imake.bat')]
 guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'rse_arguments',
         9)],
         'selection_end': 7951L,
         'selection_start': 7944L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/BaseHTTPServer.py'): {'a'\
+                       loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
+        'ttrib-starts': [],
+        'first-line': 0,
+        'folded-linenos': [],
+        'sel-line': 0,
+        'sel-line-start': 0,
+        'selection_end': 0,
+        'selection_start': 0},
+                       loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
+        'ttrib-starts': [],
+        'first-line': 24,
+        'folded-linenos': [],
+        'sel-line': 41,
+        'sel-line-start': 1595,
+        'selection_end': 1595,
+        'selection_start': 1595},
+                       loc('../../../../Python27/lib/site-packages/gi/module.py'): {'a'\
+        'ttrib-starts': [('IntrospectionModule',
+                          110),
+                         ('IntrospectionModule.__getattr__',
+                          132)],
+        'first-line': 121,
+        'folded-linenos': [],
+        'sel-line': 136,
+        'sel-line-start': 4187,
+        'selection_end': 4187,
+        'selection_start': 4187},
+                       loc('../../../../Python27/lib/BaseHTTPServer.py'): {'a'\
         'ttrib-starts': [('BaseHTTPRequestHandler',
                           113),
                          ('BaseHTTPRequestHandler.handle_one_request',
         'sel-line-start': 12434,
         'selection_end': 12434,
         'selection_start': 12434},
-                       loc('../../../../Python27/Lib/argparse.py'): {'attrib'\
+                       loc('../../../../Python27/lib/argparse.py'): {'attrib'\
         '-starts': [('_VersionAction',
                      999),
                     ('_VersionAction.__call__',
         'sel-line-start': 35713L,
         'selection_end': 35713L,
         'selection_start': 35713L},
-                       loc('../../../../Python27/Lib/base64.py'): {'attrib-s'\
+                       loc('../../../../Python27/lib/base64.py'): {'attrib-s'\
         'tarts': [('b64decode',
                    58)],
         'first-line': 54,
         'sel-line-start': 2478,
         'selection_end': 2478,
         'selection_start': 2478},
-                       loc('../../../../Python27/Lib/json/__init__.py'): {'a'\
+                       loc('../../../../Python27/lib/json/__init__.py'): {'a'\
         'ttrib-starts': [('loads',
                           293)],
         'first-line': 316L,
         'sel-line-start': 13995L,
         'selection_end': 13995L,
         'selection_start': 13995L},
-                       loc('../../../../Python27/Lib/json/decoder.py'): {'at'\
+                       loc('../../../../Python27/lib/json/decoder.py'): {'at'\
         'trib-starts': [('JSONDecoder',
                          271),
                         ('JSONDecoder.decode',
         'selection_end': 13117L,
         'selection_start': 13117L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
+                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
         's': [('_compile',
                229)],
         'first-line': 236L,
         'selection_end': 10653L,
         'selection_start': 10653L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
-        'ttrib-starts': [],
-        'first-line': 0,
-        'folded-linenos': [],
-        'sel-line': 0,
-        'sel-line-start': 0,
-        'selection_end': 0,
-        'selection_start': 0},
-                       loc('../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/requests/adapters.py'): {'a'\
         'ttrib-starts': [('HTTPAdapter',
                           77),
                          ('HTTPAdapter.send',
         'sel-line-start': 19494L,
         'selection_end': 19494L,
         'selection_start': 19494L},
-                       loc('../../../../Python27/Lib/site-packages/requests/api.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/requests/api.py'): {'a'\
         'ttrib-starts': [('request',
                           15)],
         'first-line': 37,
         'sel-line-start': 2762,
         'selection_end': 2762,
         'selection_start': 2762},
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/_sslverify.py'): {'a'\
         'ttrib-starts': [('_tolerateErrors',
                           1079),
                          ('_tolerateErrors.infoCallback',
         'selection_end': 35250L,
         'selection_start': 35238L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/base.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/base.py'): {'a'\
         'ttrib-starts': [('_SignalReactorMixin',
                           1171),
                          ('_SignalReactorMixin.mainLoop',
         'selection_end': 43358L,
         'selection_start': 43358L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/posixbase.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/posixbase.py'): {'a'\
         'ttrib-starts': [('_FDWaker',
                           109),
                          ('_FDWaker.doRead',
         'selection_end': 4129L,
         'selection_start': 4129L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/selectreactor.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/selectreactor.py'): {'a'\
         'ttrib-starts': [('SelectReactor',
                           54),
                          ('SelectReactor.doSelect',
         'selection_end': 4737L,
         'selection_start': 4737L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/tcp.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/tcp.py'): {'a'\
         'ttrib-starts': [('_BaseBaseClient',
                           317),
                          ('_BaseBaseClient.connectionLost',
         'selection_end': 16452L,
         'selection_start': 16452L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/python/filepath.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/python/filepath.py'): {'a'\
         'ttrib-starts': [('FilePath',
                           671),
                          ('FilePath.open',
         'selection_end': 33502L,
         'selection_start': 33502L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/python/log.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/python/log.py'): {'a'\
         'ttrib-starts': [('callWithLogger',
                           89)],
         'first-line': 89L,
         'selection_end': 3060L,
         'selection_start': 3060L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/web/resource.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/web/resource.py'): {'a'\
         'ttrib-starts': [('Resource',
                           103),
                          ('Resource.putChild',
         'selection_end': 6970L,
         'selection_start': 6970L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site-packages/twisted/web/static.py'): {'a'\
+                       loc('../../../../Python27/lib/site-packages/twisted/web/static.py'): {'a'\
         'ttrib-starts': [('File',
                           169)],
         'first-line': 160L,
         'selection_end': 4935L,
         'selection_start': 4927L,
         'zoom': 0L},
-                       loc('../../../../Python27/Lib/site.py'): {'attrib-sta'\
+                       loc('../../../../Python27/lib/site.py'): {'attrib-sta'\
         'rts': [('setquit',
                  333),
                 ('setquit.Quitter',
         'sel-line': 359,
         'sel-line-start': 12399,
         'selection_end': 12399,
-        'selection_start': 12399},
-                       loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
-        'ttrib-starts': [],
-        'first-line': 24,
-        'folded-linenos': [],
-        'sel-line': 41,
-        'sel-line-start': 1595,
-        'selection_end': 1595,
-        'selection_start': 1595},
-                       loc('../../../../Python27/lib/site-packages/gi/module.py'): {'a'\
-        'ttrib-starts': [('IntrospectionModule',
-                          110),
-                         ('IntrospectionModule.__getattr__',
-                          132)],
-        'first-line': 121,
-        'folded-linenos': [],
-        'sel-line': 136,
-        'sel-line-start': 4187,
-        'selection_end': 4187,
-        'selection_start': 4187}}
+        'selection_start': 12399}}
 proj.build-cmd = {None: ('default',
                          None)}
 proj.default-encoding = 'utf_8'

changelog.md

+**0.8p** (21.08.2018):
+**0.8r** (29.09.2018):
+- salabots TVPlay (raidījumi pa kategorijām)
+
+**0.8p** (21.08.2018):
+- pievienots jaunais TVPlay
+
+**0.8j** (24.06.2018):
+- vēlreiz salabots replay
+- reanimētas filmas.lv
+
+**0.8h** (15.06.2018):
+- salabots replay
+
+**0.8c** (18.05.2018):
+- salabots filmix domeins (tagad filmix.co)
+
+**0.8b** (27.04.2018)
+- [change] Salabotas shortcut tiešraides un arhīvs
+
+**0.8a** (10.04.2018)
+- [change] Salaboti shortcut saraksti
+
+**0.7v** (15.03.2018)
+- [bugfix] Salabots shortcut tiešraides
+
 **0.7u** (11.03.2018)
 - [bugfix] Salabots filmix
 

imake.bat

 @echo off
 
 :--- Pull content submodule ---
-rem cd content
-rem git checkout .
-rem git pull
-rem cd ..
+cd content
+git commit -a -m a
+git checkout .
+git pull
+cd ..
 
 :=== Parameters ===
 
 content\Downloader.py
 content\resolver.py
 content\util.py
+content\file.py
 content\icon.gif
 content\run.py
 content\playstreamproxy.py
 content\sources\tvdom.py
 content\sources\ustvnow.py
 content\sources\viaplay.py
+content\sources\filmas.py
+content\sources\tvplay.py
 content\sources\YouTubeVideoUrl.py
 content\sources\jsinterp.py
 content\sources\swfinterp.py
 dos2unix %ipk_dir%CONTROL\postrm
 
 :=== conffiles file ===
-(
-echo %ext_dir2%%prog%/content/sources/streams.cfg
-) >%ipk_dir%CONTROL\conffiles
-dos2unix %ipk_dir%CONTROL\conffiles
+rem (
+rem echo %ext_dir2%%prog%/content/sources/streams.cfg
+rem ) >%ipk_dir%CONTROL\conffiles
+rem dos2unix %ipk_dir%CONTROL\conffiles
 
 :=== create ipk file ===
 if not exist %release_dir% mkdir %release_dir%

locale/plugin.pot

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-03-18 15:28+FLE Standard Time\n"
+"POT-Creation-Date: 2018-04-07 15:14+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"
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: PlayStream.py:104 PlayStream.py:1126
+#: PlayStream.py:100 PlayStream.py:1238
 msgid "Exit"
 msgstr ""
 
-#: PlayStream.py:105 PlayStream.py:1127
+#: PlayStream.py:101
 msgid "Select"
 msgstr ""
 
-#: PlayStream.py:106 PlayStream.py:1128
+#: PlayStream.py:102
 msgid "Options"
 msgstr ""
 
-#: PlayStream.py:107 PlayStream.py:1129
+#: PlayStream.py:103
 msgid "Config"
 msgstr ""
 
-#: PlayStream.py:555
+#: PlayStream.py:667
 msgid ""
 "Sorry, this file already exists:\n"
 "%s"
 msgstr ""
 
-#: PlayStream.py:933
+#: PlayStream.py:1064
 msgid "Download folder"
 msgstr ""
 
-#: PlayStream.py:934
+#: PlayStream.py:1065
 msgid "Overwrite download video"
 msgstr ""
 
-#: PlayStream.py:935
+#: PlayStream.py:1066
 msgid "TMP folder"
 msgstr ""
 
-#: PlayStream.py:936
+#: PlayStream.py:1067
 msgid "Clear tmp folder on exit"
 msgstr ""
 
-#: PlayStream.py:937
+#: PlayStream.py:1068
 msgid "Start playstreamproxy"
 msgstr ""
 
-#: PlayStream.py:941 PlayStream.py:1057
+#: PlayStream.py:1069
+msgid "Check new plugin version in feed"
+msgstr ""
+
+#: PlayStream.py:1070
+msgid "Content config file"
+msgstr ""
+
+#: PlayStream.py:1071
+msgid "Remote content config file"
+msgstr ""
+
+#: PlayStream.py:1072
+msgid "User remote content config file"
+msgstr ""
+
+#: PlayStream.py:1076 PlayStream.py:1183
 msgid "Cancel"
 msgstr ""
 
-#: PlayStream.py:942
+#: PlayStream.py:1077
 msgid "Save"
 msgstr ""
 
-#: PlayStream.py:1016
+#: PlayStream.py:1154
 msgid "Restart Enigma2?"
 msgstr ""
 
-#: plugin.py:27 plugin.py:28
-msgid "Play online streams from various sources"
-msgstr ""
-