formatēšana

.vscode/.ropeproject/config.py

@@ -0,0 +1,100 @@
+# The default ``config.py``
+# flake8: noqa
+
+
+def set_prefs(prefs):
+    """This function is called before opening the project"""
+
+    # Specify which files and folders to ignore in the project.
+    # Changes to ignored resources are not added to the history and
+    # VCSs.  Also they are not returned in `Project.get_files()`.
+    # Note that ``?`` and ``*`` match all characters but slashes.
+    # '*.pyc': matches 'test.pyc' and 'pkg/test.pyc'
+    # 'mod*.pyc': matches 'test/mod1.pyc' but not 'mod/1.pyc'
+    # '.svn': matches 'pkg/.svn' and all of its children
+    # 'build/*.o': matches 'build/lib.o' but not 'build/sub/lib.o'
+    # 'build//*.o': matches 'build/lib.o' and 'build/sub/lib.o'
+    prefs['ignored_resources'] = ['*.pyc', '*~', '.ropeproject',
+                                  '.hg', '.svn', '_svn', '.git', '.tox']
+
+    # Specifies which files should be considered python files.  It is
+    # useful when you have scripts inside your project.  Only files
+    # ending with ``.py`` are considered to be python files by
+    # default.
+    #prefs['python_files'] = ['*.py']
+
+    # Custom source folders:  By default rope searches the project
+    # for finding source folders (folders that should be searched
+    # for finding modules).  You can add paths to that list.  Note
+    # that rope guesses project source folders correctly most of the
+    # time; use this if you have any problems.
+    # The folders should be relative to project root and use '/' for
+    # separating folders regardless of the platform rope is running on.
+    # 'src/my_source_folder' for instance.
+    #prefs.add('source_folders', 'src')
+
+    # You can extend python path for looking up modules
+    #prefs.add('python_path', '~/python/')
+
+    # Should rope save object information or not.
+    prefs['save_objectdb'] = True
+    prefs['compress_objectdb'] = False
+
+    # If `True`, rope analyzes each module when it is being saved.
+    prefs['automatic_soa'] = True
+    # The depth of calls to follow in static object analysis
+    prefs['soa_followed_calls'] = 0
+
+    # If `False` when running modules or unit tests "dynamic object
+    # analysis" is turned off.  This makes them much faster.
+    prefs['perform_doa'] = True
+
+    # Rope can check the validity of its object DB when running.
+    prefs['validate_objectdb'] = True
+
+    # How many undos to hold?
+    prefs['max_history_items'] = 32
+
+    # Shows whether to save history across sessions.
+    prefs['save_history'] = True
+    prefs['compress_history'] = False
+
+    # Set the number spaces used for indenting.  According to
+    # :PEP:`8`, it is best to use 4 spaces.  Since most of rope's
+    # unit-tests use 4 spaces it is more reliable, too.
+    prefs['indent_size'] = 4
+
+    # Builtin and c-extension modules that are allowed to be imported
+    # and inspected by rope.
+    prefs['extension_modules'] = []
+
+    # Add all standard c-extensions to extension_modules list.
+    prefs['import_dynload_stdmods'] = True
+
+    # If `True` modules with syntax errors are considered to be empty.
+    # The default value is `False`; When `False` syntax errors raise
+    # `rope.base.exceptions.ModuleSyntaxError` exception.
+    prefs['ignore_syntax_errors'] = False
+
+    # If `True`, rope ignores unresolvable imports.  Otherwise, they
+    # appear in the importing namespace.
+    prefs['ignore_bad_imports'] = False
+
+    # If `True`, rope will insert new module imports as
+    # `from <package> import <module>` by default.
+    prefs['prefer_module_from_imports'] = False
+
+    # If `True`, rope will transform a comma list of imports into
+    # multiple separate import statements when organizing
+    # imports.
+    prefs['split_imports'] = False
+
+    # If `True`, rope will sort imports alphabetically by module name
+    # instead of alphabetically by import statement, with from imports
+    # after normal imports.
+    prefs['sort_imports_alphabetically'] = False
+
+
+def project_opened(project):
+    """This function is called after opening the project"""
+    # Do whatever you like here!

.vscode/launch.json

@@ -0,0 +1,168 @@
+{
+    "version": "0.2.0",
+    "configurations": [{
+            "name": "Python",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${file}",
+            "cwd": "${workspaceRoot}",
+            "console": "integratedTerminal",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "PySpark",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "osx": {
+                "pythonPath": "${env.SPARK_HOME}/bin/spark-submit"
+            },
+            "windows": {
+                "pythonPath": "${env.SPARK_HOME}/bin/spark-submit.cmd"
+            },
+            "linux": {
+                "pythonPath": "${env.SPARK_HOME}/bin/spark-submit"
+            },
+            "program": "${file}",
+            "cwd": "${workspaceRoot}",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python Module",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "module": "module.name",
+            "cwd": "${workspaceRoot}",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Integrated Terminal/Console",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${file}",
+            "cwd": "null",
+            "console": "integratedTerminal",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit"
+            ]
+        },
+        {
+            "name": "External Terminal/Console",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${file}",
+            "cwd": "null",
+            "console": "externalTerminal",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit"
+            ]
+        },
+        {
+            "name": "Django",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${workspaceRoot}/manage.py",
+            "cwd": "${workspaceRoot}",
+            "args": [
+                "runserver",
+                "--noreload"
+            ],
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput",
+                "DjangoDebugging"
+            ]
+        },
+        {
+            "name": "Flask",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
+            "cwd": "${workspaceRoot}",
+            "env": {
+                "FLASK_APP": "${workspaceRoot}/quickstart/app.py"
+            },
+            "args": [
+                "run",
+                "--no-debugger",
+                "--no-reload"
+            ],
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Flask (old)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${workspaceRoot}/run.py",
+            "cwd": "${workspaceRoot}",
+            "args": [],
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Watson",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${workspaceRoot}/console.py",
+            "cwd": "${workspaceRoot}",
+            "args": [
+                "dev",
+                "runserver",
+                "--noreload=True"
+            ],
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Attach (Remote Debug)",
+            "type": "python",
+            "request": "attach",
+            "localRoot": "${workspaceRoot}",
+            "remoteRoot": "${workspaceRoot}",
+            "port": 3000,
+            "secret": "my_secret",
+            "host": "localhost"
+        }
+    ]
+}

ContentSources.py

@@ -7,25 +7,24 @@
 #
 
 import sys,os,re
-import urllib2
 sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
 from  sources.SourceBase import stream_type
 import util
 
 
-stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":""}
+stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {}, "desc":"", "img":"", "lang": "", "type": ""}
 
 class ContentSources(object):
     """Wrapper for content sources plugin"""
 
     #----------------------------------------------------------------------
-    def __init__(self,plugin_path):
+    def __init__(self, plugin_path):
         self.plugins = {}
-        self.error_content = [("..atpakaļ","back",None,"Kļūda, atgriezties atpakaļ")]
+        self.error_content = [("..atpakaļ", "back", None, "Kļūda, atgriezties atpakaļ")]
         sys.path.insert(0, plugin_path)
         for f in os.listdir(plugin_path):
             fname, ext = os.path.splitext(f)
-            if fname == "__init__":continue
+            if fname == "__init__": continue
             if ext == '.py':
                 mod = __import__(fname)
                 reload(mod)
@@ -164,7 +163,7 @@ if __name__ == "__main__":
         cur2 = content[n-1]
 
         data0 = cur2[1].split("::")[1] if "::" in cur2[1] else cur2[1]
-        if (not data0):
+        if not data0:
             pass
 
         elif cur2[1] == "back":

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.5o
+    set ver=0.5p
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF
@@ -24,7 +24,7 @@ set AR=\MinGW\bin\ar.exe
 set TAR=\MinGW\msys\1.0\bin\tar.exe
 
 :=== data files ===
-if exist %ipk_dir% rm -r -f %ipk_dir% 
+if exist %ipk_dir% rm -r -f %ipk_dir%
 mkdir %ipk_dir%
 for %%f in (
 readme.md
@@ -43,26 +43,26 @@ streamproxy.py
 offline.mp4
 demjson.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\__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\serialguru.py        
-sources\tvdom.py             
-sources\ustvnow.py           
-sources\viaplay.py           
-sources\YouTubeVideoUrl.py   
-sources\jsinterp.py          
+sources\movieplace.py
+sources\ltc.py
+sources\mtgplay.py
+sources\play24.py
+sources\replay.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
@@ -91,7 +91,7 @@ echo Section:
 echo Priority: optional
 echo Maintainer: ivars777@gmail.com
 echo Homepage:
-echo Depends: python-json,python-twisted-web,python-simplejson,python-html,python-zlib,python-requests 
+echo Depends: python-json,python-twisted-web,python-simplejson,python-html,python-zlib,python-requests
 echo Source:
 ) >%ipk_dir%CONTROL\control
 dos2unix %ipk_dir%CONTROL\control

ipkg/CONTROL/control

@@ -1,4 +1,4 @@
-Version: 0.5o
+Version: 0.5p
 Package: enigma2-plugin-extensions-playstream
 Description: Play online streams from various sources, mostly Latvian
 Architecture: all
@@ -6,5 +6,5 @@ Section:
 Priority: optional
 Maintainer: ivars777@gmail.com
 Homepage:
-Depends: python-json,python-twisted-web,python-simplejson,python-html,python-zlib,python-requests 
+Depends: python-json,python-twisted-web,python-simplejson,python-html,python-zlib,python-requests
 Source:

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/ContentSources.py

@@ -11,7 +11,9 @@ import urllib2
 sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
 from  sources.SourceBase import stream_type
 import util
-stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":""}                   
+
+
+stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":""}
 
 class ContentSources(object):
     """Wrapper for content sources plugin"""
@@ -46,12 +48,12 @@ class ContentSources(object):
                 cfg.add_item("home",(title,"%s::home"%pl,img,desc))
                 cfg.write_streams()
 
-    def get_content(self,data):        
+    def get_content(self,data):
         source = data.split("::")[0]
         if source in self.plugins:
             content = self.plugins[source].get_content(data)
             if content:
-                if isinstance(content,list):      
+                if isinstance(content,list):
                     for i,item in enumerate(content):
                         item2=[]
                         for el in item:
@@ -75,7 +77,7 @@ class ContentSources(object):
     def get_streams(self,data):
         if stream_type(data):
             if "::" in data:
-                data = data.split("::")[1]                    
+                data = data.split("::")[1]
             content = self.get_content(data)
             stream = stream0.copy()
             stream["name"] = data
@@ -93,7 +95,7 @@ class ContentSources(object):
             for s in streams:
                 for k in s:
                     if isinstance(s[k],unicode):
-                        s[k] = s[k].encode("utf8")            
+                        s[k] = s[k].encode("utf8")
             return streams
         else:
             return []
@@ -149,7 +151,7 @@ if __name__ == "__main__":
 
         while True:
             a = raw_input("Enter numeber, q for exit: ")
-            if a in ("q","Q","x","X"): 
+            if a in ("q","Q","x","X"):
                 exit_loop = True
                 print "Exiting"
                 break
@@ -158,7 +160,7 @@ if __name__ == "__main__":
                 break
             except:
                 print "Not number!"
-        if exit_loop: break 
+        if exit_loop: break
         cur2 = content[n-1]
 
         data0 = cur2[1].split("::")[1] if "::" in cur2[1] else cur2[1]
@@ -166,7 +168,7 @@ if __name__ == "__main__":
             pass
 
         elif cur2[1] == "back":
-            cur = history.pop()  
+            cur = history.pop()
         elif sources.is_video(cur2[1]):
             if sources.stream_type(cur2[1]):
                 stream = stream0.copy()
@@ -186,7 +188,7 @@ if __name__ == "__main__":
         else:
             if "{0}" in cur2[1]:
                 a = raw_input("Enter value:")
-                cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])           
+                cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])
             history.append(cur)
             cur = cur2
         content = sources.get_content(cur[1])

resolvers/hqqresolver.py

@@ -21,7 +21,7 @@ try:
     import util
 except:
     pp = os.path.dirname(os.path.abspath(__file__))
-    sys.path.insert(0,os.sep.join(pp.split(os.sep)[:-1]))
+    sys.path.insert(0, os.sep.join(pp.split(os.sep)[:-1]))
     import util
 import requests
 

sources/movieplace.py

@@ -23,7 +23,7 @@ h = HTMLParser.HTMLParser()
 
 class Source(SourceBase):
 
-    def __init__(self,country=""):
+    def __init__(self, country=""):
         self.name = "movieplace"
         self.title = "MoviePlace.lv"
         self.img = "http://movieplace.lv/images/logo.png"
@@ -44,8 +44,8 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
     ######### Entry point ########
     def get_content(self, data):
         print "[movieplace] get_content:", data
-        source,data,path,plist,clist,params,qs = self.parse_data(data)
-        content=[]
+        source, data, path, plist, clist, params, qs = self.parse_data(data)
+        content = []
         content.append(("..return", "back","","Return back"))
 
         if clist=="home":
@@ -93,7 +93,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             else:
                 r = self.call(data)
             #r = r.decode("cp1251").encode("utf8")
-            if clist=="load":
+            if clist == "load":
                 result = re.findall(r' <a href="/([^"]+)" alt="([^"]+)"><img src="/([^"]+)" title="([^"]+)">.+?<div class="years">([^<]+)</div>\s+<div class="country">([^<]+)</div>', r, re.DOTALL)
             else:
                 result = re.findall(r' <a href="/([^"]+)" alt="([^"]+)"><img src="/([^"]+)" title="[^"]+">.+?<span>([^<]+)</span>\s*<div class="country">([^<]+)</div>', r, re.IGNORECASE | re.DOTALL)

util.py

@@ -248,7 +248,19 @@ def ttaf2srt(s):
 
 
 def item():
-    stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
+    stream0 = {
+        'name': '',
+        'url': '',
+        'quality': '?',
+        'surl': '',
+        'subs': [],
+        'headers': {},
+        "desc":"","img":"",
+        "lang":"",
+        "type":"",
+        "resolver":"",
+        "order":0
+        }
     return stream0
 
 class _StringCookieJar(cookielib.LWPCookieJar):