--hires -r opcija

try/except lai nelido ārā uz bojātiem imidžiem

deploy.bat

@@ -0,0 +1,21 @@
+@echo off
+set dm=dm800se
+
+if (dm800se)==(%1%) (
+	set TARGET=v:\usr\lib\enigma2\python\Plugins\Extensions\GetPicons\
+) else if (dm500hd)==(%1%) (
+	set TARGET=u:\usr\lib\enigma2\python\Plugins\Extensions\GetPicons\
+) else (
+	echo Not valid dreambox name
+	pause
+	GOTO:EOF
+)
+
+for %%f in (
+readme.txt
+__init__.py
+plugin.py
+get_picons.py
+) do echo f | xcopy /y  %%f %TARGET%%%f
+
+pause

get_picons.py

@@ -59,8 +59,8 @@ def main(argv):
     global options, args, services
 
     # Parsing options
-    opt_short = 'p:s:z:f:e:odh'
-    opt_long = ["package=","sat","folder=","enigma=","overwrite","debug","help"]
+    opt_short = 'p:s:z:f:e:ordh'
+    opt_long = ["package=","sat","folder=","enigma=","overwrite","hires","debug","help"]
     options,args = parse_arguments(argv[1:], opt_short, opt_long)
     options.package = _sd(options.package,_sd(options.p,""))
     options.sat = _sd(options.sat,_sd(options.s,""))
@@ -69,6 +69,7 @@ def main(argv):
     options.size = _sd(options.size,_sd(options.z,"220x132"))
     options.overwrite = _sl(_sd(options.overwrite,options.o))
     options.debug = _sl(_sd(options.debug,options.d))
+    options.hires = _sl(_sd(options.hires,options.r))
 
     options.w,options.h = map(int,options.size.split("x"))
     if not os.path.exists(options.folder):
@@ -78,7 +79,7 @@ def main(argv):
         #filename="get_picons.log" if not os.name == "posix" else "/var/log/get_picons.log"
         filename = os.path.join(options.folder,"get_picons.log")
         FORMAT = "%(asctime)-15s %(message)s"
-        logging.basicConfig(filename=filename, format=FORMAT,level=logging.DEBUG)
+        logging.basicConfig(filename=filename, format=FORMAT,level=logging.ERROR)
 
     print "** Analyzing lamedb"
     services = DBServices(options.enigma)
@@ -151,9 +152,10 @@ def create_picons(package):
                 #icon_url = "http://www.lyngsat.com" + icon_url.group(1).replace("/icon","/logo").replace(".gif",".jpg")
                 # https://www.lyngsat.com/logo/tv/vv/viasat_history.png
                 # https://www.lyngsat-logo.com/hires/vv/viasat_history.png
-                icon_url = "https://www.lyngsat.com" + icon_url.group(1) # simple picture
-                # TODO - varētu ņemt labo bildi un pēc tam to jēdzīgi apstrādāt ?
-                #icon_url = "https://www.lyngsat-logo.com" + icon_url.group(1).replace("/logo/tv","/hires") # advanced picture
+                if options.hires:
+                    icon_url = "https://www.lyngsat-logo.com" + icon_url.group(1).replace("/logo/tv", "/hires")
+                else:
+                    icon_url = "https://www.lyngsat.com" + icon_url.group(1) # simple picture
             else:
                 icon_url = ""
             name = html_text(td[b+1]).group(1)
@@ -179,10 +181,12 @@ def create_picons(package):
                 sref = find_sref(ns,freq+1,polar,sid)
                 if not sref:
                     sref = find_sref(ns,freq-1,polar,sid)
+                    if not sref:
+                        sref = find_sref(ns, freq, polar-2, sid)
             if not sref:
                 if options.debug:
                     print " -- NOK (no sref in lamedb!)"
-                    logging.debug(u" no sref - package:%i/%s: service:%s pos:%s/%s freq:%i polar:%s sid:%i/%x"%(ns,package, name,ns, pos_int2str(ns),freq,polar,sid,sid))
+                    logging.error(u" no sref - package:%i/%s: service:%s pos:%s/%s freq:%i polar:%s sid:%i/%x"%(ns,package, name,ns, pos_int2str(ns),freq,polar,sid,sid))
                 continue
 
             fname = sref.replace(":","_")
@@ -196,19 +200,22 @@ def create_picons(package):
             #try:
             #im = Image.open(StringIO(urllib2.urlopen(icon_url).read()))
             data = get_page(icon_url)
-            im = Image.open(StringIO(data))
-            #im = im.crop((0,10,132,89))
-    
-            im = im.resize((options.w,options.h), Image.ANTIALIAS)
-            im = im.convert('P', palette=Image.ADAPTIVE)
-            #except Exception:
-            #    im = None
+            if not data:
+                if options.debug: print " -- NOK (no picon image)"
+                continue
+            try:
+                im = Image.open(StringIO(data))
+                im.thumbnail((options.w,options.h), Image.ANTIALIAS)
+                im = im.convert('P', palette=Image.ADAPTIVE)
+            except Exception:
+                im = None
             if not im:
                 if options.debug: print " -- NOK (no picon image)"
                 continue
 
             if options.debug: print " -- downloaded"
             im.save(fname,"png")
+            del im
             num_picons += 1
 
     print "%i picons created, %i skipped"%(num_picons,num_skipped)
@@ -550,9 +557,11 @@ Referer: http://www.lyngsat.com/
 """)
 
 def get_page(url):
-    
    r=requests.get(url,headers=headers)
-   return r.content
+   if r.status_code in (200,304):
+        return r.content
+   else:
+       return ""
     
     
 html_text = lambda html: re.search(r">([^<^\n]+?)<", html, re.DOTALL | re.IGNORECASE)