labojumi

addon.py

 # -*- coding: utf-8 -*-
+
 try:
     import wingdbstub
+    #import ptvsd
+    #ptvsd.enable_attach("debug", address = ('127.0.0.1', 5678))
+    #ptvsd.wait_for_attach()
+    print "[playstream] Remote debug started"
 except:
+    print "[playstream] Remote debug skipped"
     pass
-#try:
-#    import ptvsd
-#    ptvsd.enable_attach("debug")
-#    ptvsd.wait_for_attach()
-#except:
-#    pass
-import os,os.path,sys, glob, shutil, re
+import os, os.path,sys, glob, shutil, re
 import urllib, traceback
 try:
     import cPickle as pickle
     sources.plugins[source].options_write(options)
 
 
-
 @plugin.route(".+" )
 def main():
     global prefix
     if len(streams)>1:
         slist = []
         for s in streams:
-            slist.append("%s [%s,%s]"%(s["name"],s["quality"],s["lang"]))
-        res = xbmcgui.Dialog().select("Select stream",slist, useDetails=True) if not CLI_MODE else 0
+            name2 = "%s,%s" % (s["quality"],s["lang"]) if s["lang"] else s["quality"]
+            slist.append("[%s] %s"%(name2, s["name"]))
+        res = xbmcgui.Dialog().select("Select stream",slist) if not CLI_MODE else 0
         #res = xbmcgui.Dialog().contextmenu(slist) if not CLI_MODE else 0
         stream = streams[res]
     else:
             "Banner": 501,
             "FanArt": 502
         },
-            "skin.estuary.isl": {
+        "skin.estuary.isl": {
             "None": None,
             "List": 50,
             "Poster": 51,

addon.xml

 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon version="0.1.83" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
+<addon version="0.1.94" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" />
     <import addon="script.module.simplejson" />
-    <import addon="script.module.pycryptodome" optional="true"/>
+    <import addon="script.module.twisted" optional="true"/>
   </requires>
   <extension point="xbmc.python.pluginsource" library="addon.py">
     <provides>video</provides>

changelog.md

+**0.1.94** (04.09.2018):
+- [fix] salabots TVPlay (raidījumu kategorijas)
+
+**0.1.93** (04.09.2018):
+- [feature] pievienota iespēja spēlēt strīmus no enigma2 satelītuztvērēja
+
+**0.1.91** (21.08.2018):
+- [feature] pievienots jaunais tvplay (nepareiza mime-type dēļ nerādās bildes)
+
 **0.1.77** (28.06.2018):
 - [change] salabots, lai strādā ar Kodi 18 (alpha2)
 

context_download.py

     if len(streams)>1 and not num:
         slist = []
         for s in streams:
-            slist.append("%s [%s,%s]"%(s["name"],s["quality"],s["lang"]))
+            name2 = "%s,%s" % (s["quality"],s["lang"]) if s["lang"] else s["quality"]
+            slist.append("[%s] %s"%(name2, s["name"]))
         res = xbmcgui.Dialog().select("Select stream",slist) if not CLI_MODE else 0
         #res = xbmcgui.Dialog().contextmenu(slist) if not CLI_MODE else 0
         stream = streams[res]
 #    if not "User-Agent" in headers:
 #        headers["User-Agent"] = UA
     #outputfile = file.join(download_dir,output)
+    if "/" in outputfile:
+        output = outputfile.split('/')[-1]
+    else:
+        output = outputfile.split('\\')[-1]
 
-    if cb_notify: cb_notify("Download started - %s" % outputfile)
-    print "Download started - %s" % outputfile, url
+    if cb_notify: cb_notify("Download started - %s" % output)
+    print "Download started - %s" % output
     #print url
 
 
         r = requests.get(url2, headers=headers, verify=False)
         content = r.content
         if key:
-            #from Crypto.Cipher import AES
-            import pyaes
+            try:
+                from Cryptodome.Cipher import AES
+            except:
+                raise Exception("No Crypto or Cryptodome library")
+            #import pyaes
             iv = content[:16]
             #key2 = binascii.a2b_hex(key)
-            #d = AES.new(key, AES.MODE_CBC, iv)
-            d = pyaes.AESModeOfOperationCBC(key, iv = iv)
-            content2 = ""
-            for i in range(16, len(content), 16):
-                content2 += d.decrypt(content[i:i+16])
-            content = content2
-            #content = d.decrypt(content[16:])
+            d = AES.new(key, AES.MODE_CBC, iv)
+            #d = pyaes.AESModeOfOperationCBC(key, iv = iv)
+            #content2 = ""
+            #for i in range(16, len(content), 16):
+            #    content2 += d.decrypt(content[i:i+16])
+            #content = content2
+            content = d.decrypt(content[16:])
             #d = pyaes.Decrypter(pyaes.AESModeOfOperationCBC(key, iv))
             #content = d.feed(content[16:])
         tsfile.write(content)
 #    if not "User-Agent" in headers:
 #        headers["User-Agent"] = UA
     #fname = file.join(download_dir,output)
+    if "/" in outputfile:
+        output = outputfile.split('/')[-1]
+    else:
+        output = outputfile.split('\\')[-1]
 
-    if cb_notify: cb_notify("Download started - %s" % outputfile)
-    print "Download started - %s" % outputfile
+    if cb_notify: cb_notify("Download started - %s" % output)
+    print "Download started - %s" % output
     #print url
     try:
         r = requests.get(url,headers=headers, stream=True)

kmake.bat

 
 :--- Pull content submodule ---
 pushd resources\lib\content
-:git commit -a -m a
-:git checkout .
-:git pull
+rem git commit -a -m a
+git checkout .
+git pull
 popd
 
 :=== Parameters ===
 python get_version.py addon.xml >version.txt
 set /p ver=<version.txt
 echo %ver%
-rem pause
+pause
 
 set prog=PlayStream
 set pack_name=plugin.video.playstream
 resources\lib\content\sources\ustvnow.py
 resources\lib\content\sources\viaplay.py
 resources\lib\content\sources\filmas.py
+resources\lib\content\sources\tvplay.py
+resources\lib\content\sources\enigma2.py
 resources\lib\content\sources\YouTubeVideoUrl.py
 resources\lib\content\sources\jsinterp.py
 resources\lib\content\sources\swfinterp.py

resources/language/English/strings.xml

   <string id="40013">USTVNow</string>
   <string id="40014">FilmOn</string>
   <string id="40015">MTGPlay</string>
+  <string id="40016">Enigma2</string>
 
   <string id="50001">Username</string>
   <string id="50002">Password</string>
   <string id="50023">Remote content config file location/name (ftp or http)</string>
   <string id="50024">Use remote content config file</string>
   <string id="50025">Overwrite existing files while downloading</string>
-
+  <string id="50026">Enigma2 hostname or ip address</string>
 </strings>

resources/settings.xml

         <setting type="sep" />
     </category>
 
+   <category label="40016">
+        <setting id="enigma2_host" label="50026" type="text" default="" />
+        <setting id="enigma2_user" label="50001" type="text" default="" />
+        <setting id="enigma2_password" label="50002" type="text" default="change password" />
+        <setting type="sep" />
+    </category>
 
 </settings>

wingdbstub.py

 #########################################################################
-""" wingdbstub.py    -- Debug stub for debuggifying Python programs
+""" wingdbstub.py -- Start debugging Python programs from outside of Wing
 
-Copyright (c) 1999-2001, Archaeopteryx Software, Inc.  All rights reserved.
+Copyright (c) 1999-2018, Archaeopteryx Software, Inc.  All rights reserved.
 
 Written by Stephan R.A. Deibel and John P. Ehresman
 
 Usage:
 -----
 
-This is the file that Wing DB users copy into their python project 
-directory if they want to be able to debug programs that are launched
-outside of the IDE (e.g., CGI scripts, in response to a browser page
-load).
-
-To use this, edit the configuration values below to match your 
-Wing installation and requirements of your project.
-
-Then, add the following line to your code:
+This file is used to initiate debug in Python code without launching
+that code from Wing.  To use it, edit the configuration values below,
+start Wing and configure it to listen for outside debug connections,
+and then add the following line to your code:
 
   import wingdbstub
 
-Debugging will start immediately after this import statements.
-
-Next make sure that your IDE is running and that it's configured to accept
-connections from the host the debug program will be running on.
+Debugging will start immediately after this import statement is reached.
 
-Now, invoking your python file should run the code within the debugger.
-Note, however, that Wing will not stop in the code unless a breakpoint
-is set.
-
-If the debug process is started before the IDE, or is not listening
-at the time this module is imported then the program will run with
-debugging until an attach request is seen.  Attaching only works 
-if the .wingdebugpw file is present; see the manual for details.
-
-On win32, you either need to edit WINGHOME in this script or
-pass in an environment variable called WINGHOME that points to
-the Wing installation directory.
+For details, see Debugging Externally Launched Code in the manual.
 
 """
 #########################################################################
 
 import sys
 import os
-import imp
+if sys.version_info >= (3, 7):
+  import importlib
+else:
+  import imp
 
+#------------------------------------------------------------------------
+# Required configuration values (some installers set this automatically)
+
+# This should be the full path to your Wing installation.  On OS X, use
+# the full path of the Wing application bundle, for example
+# /Applications/WingIDE.app.  When set to None, the environment variable
+# WINGHOME is used instead.
+WINGHOME = r"C:\Program Files (x86)\Wing IDE 6.1"
 
 #------------------------------------------------------------------------
-# Default configuration values:  Note that the named environment 
-# variables, if set, will override these settings.
+# Optional configuration values:  The named environment variables, if set,
+# will override these settings.
 
 # Set this to 1 to disable all debugging; 0 to enable debugging
 # (WINGDB_DISABLED environment variable)
 kWingHostPort = 'localhost:50005'
 
 # Port on which to listen for connection requests, so that the
-# IDE can (re)attach to the debug process after it has started.
+# IDE can attach or reattach to the debug process after it has started.
 # Set this to '-1' to disable listening for connection requests.
 # This is only used when the debug process is not attached to
 # an IDE or the IDE has dropped its connection. The configured
 # port can optionally be added to the IDE's Common Attach Hosts
-# preference. Note that a random port is used instead if this 
-# port is already in use!
+# preference. Note that a random port is used instead if the given
+# port is already in use.
 # (WINGDB_ATTACHPORT environment variable)
 kAttachPort = '50015'
 
 # Set this to a filename to log verbose information about the debugger
 # internals to a file.  If the file does not exist, it will be created
-# as long as its enclosing directory exists and is writeable.  Use 
-# "<stderr>" or "<stdout>".  Note that "<stderr>" may cause problems 
-# on win32 if the debug process is not running in a console.
+# as long as its enclosing directory exists and is writeable.  Use
+# "<stderr>" or "<stdout>" to write to stderr or stdout.  Note that
+# "<stderr>" may cause problems on Windows if the debug process is not
+# running in a console.
 # (WINGDB_LOGFILE environment variable)
 kLogFile = None
 
-# Set to get a tremendous amount of logging from the debugger internals
-# (WINGDB_LOGVERYVERBOSE)
+# Produce a tremendous amount of logging from the debugger internals.
+# Do not set this unless instructed to do so by Wingware support.  It
+# will slow the debugger to a crawl.
+# (WINGDB_LOGVERYVERBOSE environment variable)
 kLogVeryVerbose = 0
 
 # Set this to 1 when debugging embedded scripts in an environment that
-# creates and reuses a Python instance across multiple script invocations:  
+# creates and reuses a Python instance across multiple script invocations.
 # It turns off automatic detection of program quit so that the debug session
 # can span multiple script invocations.  When this is turned on, you may
 # need to call ProgramQuit() on the debugger object to shut down the
 # only the first one will be able to debug unless it terminates debug
 # and the environment variable WINGDB_ACTIVE is unset before importing
 # this module in the second or later Python instance.  See the Wing
-# IDE manual for details.
-kEmbedded = 0
+# manual for details.
+# (WINGDB_EMBEDDED environment variable)
+kEmbedded = 1
 
 # Path to search for the debug password file and the name of the file
-# to use.  The password file contains the encryption type and connect 
-# password for all connections to the IDE and must match the wingdebugpw
-# file in the profile dir used by the IDE.  Any entry of '$<winguserprofile>' 
-# is replaced by the wing user profile directory for the user that the 
-# current process is running as
+# to use.  The password file contains a security token for all
+# connections to the IDE and must match the wingdebugpw file in the
+# User Settngs directory used by the IDE. '$<winguserprofile>'
+# is replaced by the User Settings directory for the user that
+# is running the process.
 # (WINGDB_PWFILEPATH environment variable)
 kPWFilePath = [os.path.dirname(__file__), '$<winguserprofile>']
 kPWFileName = 'wingdebugpw'
 
-# Whether to exit if the debugger fails to run or to connect with an IDE
-# for whatever reason
+# Whether to exit when the debugger fails to run or to connect with the IDE
+# By default, execution continues without debug or without connecting to
+# the IDE.
+# (WINGDB_EXITONFAILURE environment variable)
 kExitOnFailure = 0
 
 #------------------------------------------------------------------------
 # Find Wing debugger installation location
 
-# Edit this to point to your Wing installation or set to None to use env WINGHOME
-# On OS X this must be set to name of the Wing application bundle
-# (for example, /Applications/WingIDE.app)
-WINGHOME = None
-
 if sys.hexversion >= 0x03000000:
   def has_key(o, key):
     return key in o
 else:
   def has_key(o, key):
     return o.has_key(key)
-    
+
 # Check environment:  Must have WINGHOME defined if still == None
 if WINGHOME == None:
   if has_key(os.environ, 'WINGHOME'):
     WINGHOME=os.environ['WINGHOME']
   else:
-    sys.stdout.write("*******************************************************************\n")
-    sys.stdout.write("Error: Could not find Wing installation!  You must set WINGHOME or edit\n")
-    sys.stdout.write("wingdbstub.py where indicated to point it to the location where\n")
-    sys.stdout.write("Wing is installed.\n")
-    sys.exit(1)
-
+    msg = '\n'.join(["*******************************************************************",
+                     "Error: Could not find Wing installation!  You must set WINGHOME or edit",
+                     "wingdbstub.py where indicated to point it to the location where",
+                     "Wing is installed.\n"])
+    sys.stderr.write(msg)
+    raise ImportError(msg)
+
+WINGHOME = os.path.expanduser(WINGHOME)
 kPWFilePath.append(WINGHOME)
 
 # The user settings dir where per-user settings & patches are located.  Will be
 kUserSettingsDir = None
 if kUserSettingsDir is None:
   kUserSettingsDir = os.environ.get('WINGDB_USERSETTINGS')
-  
+
 def _FindActualWingHome(winghome):
   """ Find the actual directory to use for winghome.  Needed on OS X
   where the .app directory is the preferred dir to use for WINGHOME and
   .app/Contents/MacOS is accepted for backward compatibility. """
-  
+
   if sys.platform != 'darwin':
     return winghome
-  
+
   app_dir = None
   if os.path.isdir(winghome):
     if winghome.endswith('/'):
       wo_slash = winghome[:-1]
     else:
       wo_slash = winghome
-      
+
     if wo_slash.endswith('.app'):
       app_dir = wo_slash
     elif wo_slash.endswith('.app/Contents/MacOS'):
       app_dir = wo_slash[:-len('/Contents/MacOS')]
-    
+
   if app_dir and os.path.isdir(os.path.join(app_dir, 'Contents', 'Resources')):
     return os.path.join(app_dir, 'Contents', 'Resources')
-  
+
   return winghome
-  
+
 def _ImportWingdb(winghome, user_settings=None):
   """ Find & import wingdb module. """
-  
+
   try:
     exec_dict = {}
     execfile(os.path.join(winghome, 'bin', '_patchsupport.py'), exec_dict)
   dir_list.extend([os.path.join(winghome, 'bin'), os.path.join(winghome, 'src')])
   for path in dir_list:
     try:
-      f, p, d = imp.find_module('wingdb', [path])
-      try:
-        return imp.load_module('wingdb', f, p, d)
-      finally:
-        if f is not None:
-          f.close()
-      break
+      if sys.version_info >= (3, 7):
+        import importlib.machinery
+        import importlib.util
+
+        spec = importlib.machinery.PathFinder.find_spec('wingdb', [path])
+        if spec is not None:
+          mod = importlib.util.module_from_spec(spec)
+          if mod is not None:
+            spec.loader.exec_module(mod)
+            return mod
+      else:
+        f, p, d = imp.find_module('wingdb', [path])
+        try:
+          return imp.load_module('wingdb', f, p, d)
+        finally:
+          if f is not None:
+            f.close()
+
     except ImportError:
       pass
 
+  return None
+
 #------------------------------------------------------------------------
 # Set debugger if it hasn't been set -- this is to handle module reloading
 # In the reload case, the debugger variable will be set to something
   debugger
 except NameError:
   debugger = None
-  
+
 # Unset WINGDB_ACTIVE env if it was inherited from another process
 # XXX Would be better to be able to call getpid() on dbgtracer but can't access it yet
 if 'WINGDB_ACTIVE' in os.environ and os.environ['WINGDB_ACTIVE'] != str(os.getpid()):
 # Start debugging if not disabled and this module has never been imported
 # before
 if (not kWingDebugDisabled and debugger is None
-    and not has_key(os.environ, 'WINGDB_DISABLED') and 
+    and not has_key(os.environ, 'WINGDB_DISABLED') and
     not has_key(os.environ, 'WINGDB_ACTIVE')):
 
   exit_on_fail = 0
-  
+
   try:
     # Obtain exit if fails value
     exit_on_fail = os.environ.get('WINGDB_EXITONFAILURE', kExitOnFailure)
-    
+
     # Obtain configuration for log file to use, if any
     logfile = os.environ.get('WINGDB_LOGFILE', kLogFile)
     if logfile == '-' or logfile == None or len(logfile.strip()) == 0:
     very_verbose_log = os.environ.get('WINGDB_LOGVERYVERBOSE', kLogVeryVerbose)
     if type(very_verbose_log) == type('') and very_verbose_log.strip() == '':
       very_verbose_log = 0
-      
+
     # Determine remote host/port where the IDE is running
     hostport = os.environ.get('WINGDB_HOSTPORT', kWingHostPort)
     colonpos = hostport.find(':')
     host = hostport[:colonpos]
     port = int(hostport[colonpos+1:])
-  
+
     # Determine port to listen on locally for attach requests
     attachport = int(os.environ.get('WINGDB_ATTACHPORT', kAttachPort))
-  
+
     # Check if running embedded script
     embedded = int(os.environ.get('WINGDB_EMBEDDED', kEmbedded))
-  
+
     # Obtain debug password file search path
     if has_key(os.environ, 'WINGDB_PWFILEPATH'):
       pwfile_path = os.environ['WINGDB_PWFILEPATH'].split(os.pathsep)
     else:
       pwfile_path = kPWFilePath
-    
+
     # Obtain debug password file name
     if has_key(os.environ, 'WINGDB_PWFILENAME'):
       pwfile_name = os.environ['WINGDB_PWFILENAME']
     else:
       pwfile_name = kPWFileName
-    
+
     # Load wingdb.py
     actual_winghome = _FindActualWingHome(WINGHOME)
     wingdb = _ImportWingdb(actual_winghome, kUserSettingsDir)
       sys.stdout.write("Error: Cannot find wingdb.py in $(WINGHOME)/bin or $(WINGHOME)/src\n")
       sys.stdout.write("Error: Please check the WINGHOME definition in wingdbstub.py\n")
       sys.exit(2)
-    
+
     # Find the netserver module and create an error stream
     netserver = wingdb.FindNetServerModule(actual_winghome, kUserSettingsDir)
     err = wingdb.CreateErrStream(netserver, logfile, very_verbose_log)
-    
+
     # Start debugging
-    debugger = netserver.CNetworkServer(host, port, attachport, err, 
+    debugger = netserver.CNetworkServer(host, port, attachport, err,
                                         pwfile_path=pwfile_path,
                                         pwfile_name=pwfile_name,
                                         autoquit=not embedded)
     os.environ['WINGDB_ACTIVE'] = str(os.getpid())
     if debugger.ChannelClosed():
       raise ValueError('Not connected')
-    
+
   except:
     if exit_on_fail:
       raise
 def Ensure(require_connection=1, require_debugger=1):
   """ Ensure the debugger is started and attempt to connect to the IDE if
   not already connected.  Will raise a ValueError if:
-  
+
   * the require_connection arg is true and the debugger is unable to connect
   * the require_debugger arg is true and the debugger cannot be loaded
-  
+
   If SuspendDebug() has been called through the low-level API, calling
   Ensure() resets the suspend count to zero and additional calls to
   ResumeDebug() will be ignored until SuspendDebug() is called again.
-  
+
   Note that a change to the host & port to connect to will only
   be use if a new connection is made.
-  
+
   """
-  
+
   if debugger is None:
     if require_debugger:
       raise ValueError("No debugger")
   colonpos = hostport.find(':')
   host = hostport[:colonpos]
   port = int(hostport[colonpos+1:])
-  
+
   resumed = debugger.ResumeDebug()
   while resumed > 0:
     resumed = debugger.ResumeDebug()
-  
-  debugger.SetClientAddress((host, port))  
-  
+
+  debugger.SetClientAddress((host, port))
+
   if not debugger.DebugActive():
     debugger.StartDebug()
   elif debugger.ChannelClosed():
     debugger.ConnectToClient()
-    
+
   if require_connection and debugger.ChannelClosed():
     raise ValueError('Not connected')
-