pārsaukts playstreamproxy

Salabots filmix

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.5k
+    set ver=0.5l
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF
@@ -72,7 +72,7 @@ resolvers\youtuberesolver.py
 picons\*.*
 ) do echo f | xcopy /y /q %%f %ipk_dir%data\%ext_dir%%prog%\%%f
 
-xcopy /y /q streamproxy %ipk_dir%data\etc\init.d\
+xcopy /y /q playstreamproxy %ipk_dir%data\etc\init.d\
 
 :=== control file ===
 mkdir %ipk_dir%CONTROL\
@@ -100,8 +100,8 @@ echo #!/bin/sh
 :echo   rm -rf %ext_dir2%%prog%/sources/*.py* ^> /dev/null 2^>^&1
 :echo   rm -rf %ext_dir2%%prog%/resolvers/*.py* ^> /dev/null 2^>^&1
 :echo fi
-echo if [ -e /etc/init.d/streamproxy ]; then
-echo   rm /etc/init.d/streamproxy ^> /dev/null 2^>^&1
+echo if [ -e /etc/init.d/playstreamproxy ]; then
+echo   rm /etc/init.d/playstreamproxy ^> /dev/null 2^>^&1
 echo fi
 echo exit 0
 ) >%ipk_dir%CONTROL\preinst
@@ -110,10 +110,10 @@ dos2unix %ipk_dir%CONTROL\preinst
 :=== postinst file ===
 (
 echo #!/bin/sh
-echo chmod +x /etc/init.d/streamproxy
-echo ln -s /etc/init.d/streamproxy /etc/rc4.d/S50streamproxy
-echo ln -s /etc/init.d/streamproxy /etc/rc3.d/S50streamproxy
-echo ln -s /etc/init.d/streamproxy /usr/bin/streamproxy
+echo chmod +x /etc/init.d/playstreamproxy
+echo ln -s /etc/init.d/playstreamproxy /etc/rc4.d/S50playstreamproxy
+echo ln -s /etc/init.d/playstreamproxy /etc/rc3.d/S50playstreamproxy
+echo ln -s /etc/init.d/playstreamproxy /usr/bin/playstreamproxy
 echo exit 0
 ) >%ipk_dir%CONTROL\postinst
 dos2unix %ipk_dir%CONTROL\postinst
@@ -121,18 +121,18 @@ dos2unix %ipk_dir%CONTROL\postinst
 :=== postrm file ===
 (
 echo #!/bin/sh
-:echo if [ -e /etc/rc4.d/S50streamproxy ]; then
-echo   rm /etc/rc4.d/S50streamproxy ^> /dev/null 2^>^&1
+:echo if [ -e /etc/rc4.d/S50playstreamproxy ]; then
+echo   rm /etc/rc4.d/S50playstreamproxy ^> /dev/null 2^>^&1
 :echo fi
 echo #!/bin/sh
-:echo if [ -e /etc/rc3.d/S50streamproxy ]; then
-echo   rm /etc/rc3.d/S50streamproxy ^> /dev/null 2^>^&1
+:echo if [ -e /etc/rc3.d/S50playstreamproxy ]; then
+echo   rm /etc/rc3.d/S50playstreamproxy ^> /dev/null 2^>^&1
 :echo fi
-:echo if [ -e /usr/bin/streamproxyy ]; then
-echo  rm /usr/bin/streamproxy ^> /dev/null 2^>^&1
+:echo if [ -e /usr/bin/playstreamproxyy ]; then
+echo  rm /usr/bin/playstreamproxy ^> /dev/null 2^>^&1
 :echo fi
-echo if [ -e /etc/init.d/streamproxy ]; then
-echo   rm /etc/init.d/streamproxy ^> /dev/null 2^>^&1
+echo if [ -e /etc/init.d/playstreamproxy ]; then
+echo   rm /etc/init.d/playstreamproxy ^> /dev/null 2^>^&1
 echo fi
 echo exit 0
 ) >%ipk_dir%CONTROL\postrm

playstreamproxy

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

playstreamproxy.bat

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

sources/filmix.py

@@ -82,7 +82,8 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 sname = "Сериалы"
             else:
                 sname = "Мультфильмы"
-            m = re.search('<li><span class="menu-title">%s</span>(.+?)<li><span'%sname, r, re.DOTALL|re.UNICODE)
+            # <span class="menu-title">Фильмы</span>
+            m = re.search('<span class="menu-title">%s</span>(.+?)<li>\s+?<span'%sname, r, re.DOTALL|re.UNICODE)
             if not m: return content
             r2 = m.group(1)
             result = re.findall(r'<a href="http://filmix\.net/([^"]+)".*?>([^<]+)</a>', r2, re.DOTALL)