labojumi

changelog.md

@@ -1,3 +1,7 @@
+**0.4e** (11.04.2017)
+- [feature] option to set background/transparency
+- [feature] use low-res image if high-res image is not available
+
 **0.4b** (29.03.2017)
 - [bugfix] url change
 - using simple picture instead of high-res

get_picons.py

@@ -16,28 +16,32 @@ Options:
     -f PATH, --folder PATH                      picon files output folder, default - "/media/hdd/picon"
     -e PATH, --enigma PATH                      enigma2 folder whera lamedb,settings are located, default - "/etc/enigma2"
                                                 you can use urls, e.g. "ftp://root@receiver_address/etc/enigma2"
-    -o, -overwrite                              overwrite existing picons file (default - no)
-    -d, -debug                                  display work progress and write debug info to file for not found services
+    -b COLOR_CODE, --background=COLOR_CODE      background color code in hex format(HHHHHHHHH), last pair - opacity level
+                                                default - FFFFFF20 (almost transparent white)
+    -l, --simple                                simple, low resolution image with white background
+    -o, --overwrite                             overwrite existing picons file (default - no)
+    -d, --debug                                 display work progress and write debug info to file for not found services
     -h, --help                                  this help file
 
 (c)Ivars777 (ivars777@gmail.com) 2013-2015, v0.2
 """
 
-import sys, os, os.path, getopt
+import sys, os, os.path, getopt, traceback
 import re
 import urllib2
 import requests
 
 try:
-    import Image
-except:
     from PIL import Image
+except:
+    import Image
 from StringIO import StringIO
 import logging
 
 options = args = None
 _sd= lambda x,d: d if x is None else x # set default value
 _sl= lambda x: False if x is None else True # set True of False for option
+hex2rgb = lambda c: tuple(int(c[i:i+2], 16) for i in xrange(0,len(c),2))
 
 def parse_arguments(argv,opt_short,opt_long):
     "Parse command line arguments"
@@ -59,19 +63,21 @@ def main(argv):
     global options, args, services
 
     # Parsing options
-    opt_short = 'p:s:z:f:e:ordh'
-    opt_long = ["package=","sat","folder=","enigma=","overwrite","hires","debug","help"]
+    opt_short = 'p:s:z:f:e:b:lodh'
+    opt_long = ["package=","sat=","size=","folder=","enigma=","background=","simple","overwrite","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,""))
     options.enigma = _sd(options.enigma,_sd(options.e,"/etc/enigma2"))
     options.folder = _sd(options.folder,_sd(options.f,"/media/hdd/picon"))
     options.size = _sd(options.size,_sd(options.z,"220x132"))
+    options.simple = _sl(_sd(options.simple, options.l))
+    options.background = _sd(options.background, _sd(options.b, "FFFFFFFF"))
     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"))
+    options.background = hex2rgb(options.background.lstrip("#"))
     if not os.path.exists(options.folder):
         os.makedirs(options.folder)
 
@@ -149,13 +155,10 @@ def create_picons(package):
                 b=0
             icon_url = html_attr("src",td[b])
             if icon_url:
-                #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
-                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
+                icon_url_hr = "https://www.lyngsat-logo.com" + icon_url.group(1).replace("/logo/tv", "/hires")
+                icon_url_lr = "https://www.lyngsat.com" + icon_url.group(1)
             else:
                 icon_url = ""
             name = html_text(td[b+1]).group(1)
@@ -197,25 +200,45 @@ def create_picons(package):
                 num_skipped += 1
                 continue
 
-            #try:
-            #im = Image.open(StringIO(urllib2.urlopen(icon_url).read()))
-            data = get_page(icon_url)
+            if options.simple:
+                data = get_page(icon_url_lr)
+                hires = False
+            else:
+                data = get_page(icon_url_hr)
+                hires = True
+                if not data: # in not hires image available use lowres image
+                    data = get_page(icon_url_lr)
+                    hires = False
+
             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 hires:
+                    im2 = Image.new("RGBA",(options.w,options.h),options.background)
+                    #im2 = Image.new("RGBA",(options.w,options.h),(255,255,255,128))
+                    width, height = im.size
+                    x0 = (options.w-width)/2
+                    y0 = (options.h-height)/2
+                    if im.mode <> "RGBA":
+                        im = im.convert("RGBA")
+                    im2.paste(im,(x0,y0),im)
+                else:
+                    im2 = im
+                #im2 = im2.convert('P', palette=Image.ADAPTIVE)
+            except Exception as e:
+                print e.message
+                traceback.print_exc()
+                im2 = None
+            if not im2:
                 if options.debug: print " -- NOK (no picon image)"
                 continue
 
             if options.debug: print " -- downloaded"
-            im.save(fname,"png")
-            del im
+            im2.save(fname,"png")
+            del im2,im
             num_picons += 1
 
     print "%i picons created, %i skipped"%(num_picons,num_skipped)

imake.bat

@@ -1,6 +1,6 @@
 @echo off
 :=== Parameters ===
-set ver=0.4c
+set ver=0.4e
 set prog=GetPicons
 set pack_name=enigma2-plugin-extensions-getpicons
 set pack_prefix=enigma2-plugin-extensions-

plugin.py

@@ -68,6 +68,9 @@ class MainScreen(Screen):
             param += " -s %s"%(item) if item <> "all" else ""
             param += " -o" if config.plugins.getpicons.overwrite.value else ""
             param += " -z %s"%config.plugins.getpicons.size.value if config.plugins.getpicons.size.value else ""
+            param += " -b %s"%config.plugins.getpicons.background.value if config.plugins.getpicons.background.value else ""
+            param += " -l" if config.plugins.getpicons.simple.value else ""
+            param += " -d" if config.plugins.getpicons.debug.value else ""
             cur_directory = os.path.dirname(os.path.realpath(__file__))
             name = os.path.join(cur_directory,"get_picons.py")
             cmd = "python -u %s -f %s %s"%(name,config.plugins.getpicons.folder.value,param,)
@@ -93,8 +96,8 @@ Download channels picon files from lyngsat.com for all/selected satellites
 Could be run from terminal too:
 /usr/script/get_picons.sh -h
 
-Version 0.3
-(c) 2013-2016 ivars777@gmail.com"""
+Version 0.4
+(c) 2013-2017 ivars777@gmail.com"""
         self.session.open(MessageBox, txt, MessageBox.TYPE_INFO)
         #self.session.openWithCallback(self.callMyMsg, MessageBox, _("Do you want to exit the plugin?"), MessageBox.TYPE_INFO)
         return
@@ -111,6 +114,9 @@ config.plugins.getpicons = ConfigSubsection()
 config.plugins.getpicons.folder = ConfigDirectory(default="/media/hdd")
 config.plugins.getpicons.size = ConfigSelection({"400x240":"400x240","220x132":"220x132","100x60":"100x60"}, default="220x132")
 config.plugins.getpicons.overwrite = ConfigYesNo(default = True)
+config.plugins.getpicons.background = ConfigText(default="FFFFFF20")
+config.plugins.getpicons.simple = ConfigYesNo(default = False)
+config.plugins.getpicons.debug = ConfigYesNo(default = False)
 
 class ConfigScreen(ConfigListScreen,Screen):
     skin = """
@@ -137,6 +143,9 @@ class ConfigScreen(ConfigListScreen,Screen):
             getConfigListEntry(_("Picons folder"), cfg.folder),
             getConfigListEntry(_("Picon size"), cfg.size),
             getConfigListEntry(_("Overwrite existing picon files"), cfg.overwrite),
+            getConfigListEntry(_("Background color hex code (HHHHHHHH)"), cfg.background),
+            getConfigListEntry(_("Simple picon"), cfg.simple),
+            getConfigListEntry(_("Debug info"), cfg.debug),
         ]
         ConfigListScreen.__init__(self, self.list, session = self.session)
         self["key_red"] = Button(_("Cancel"))

readme.md

@@ -2,19 +2,21 @@
 
 #### Enigma2 plugin to dowload and create channels picons files form lyngsat.com
 
-Dowloads and creates Enigma2 channels picons files form lyngsat.com (straight forward downloading and resizing without transparency and other fine tunings).
-Picons for all channels in lamed are downloaded (you can subselect particular sattelites or packages via paremeters).
+Creates Enigma2 channels picons form lyngsat.com.
+Downloads and resizes lyngsat-logo.com high resolution images. Simple low-res images with white background could be used too.
+It is possible to set bacground color/transparency. Background transparency works only if pillows python library is installed!
+Picons for all channels in Enigma2 lamedb are downloaded (you can subselect particular sattelites or packages via paremeters).
 No symlinks are created for same images.
 
 You can run it several ways:
 
 1. As a Dreambox plugin (GetPicons)
 2. From Dreambox command line (/usr/script/get_picons.sh)
-3. From PC command line
+3. From PC command line (use it if you want transparent background, since pillow library usually not available on enigma2)
 
 **Prerequisites**:
 - Python 2.x
-- Python libraries-  Imaging (PIL) (usually part of standart python)
+- Python libraries-  Imaging (PIL) (usually part of standart python) or pillow
 
 **Usage (command line):**
 ```
@@ -29,7 +31,7 @@ Options:
     -f PATH, --folder PATH                      picon files output folder, default - "/media/hdd/picon"
     -e PATH, --enigma PATH                      enigma2 folder whera lamedb,settings are located, default - "/etc/enigma2"
                                                 you can use urls, e.g. "ftp://root@receiver_address/etc/enigma2"
-    -o, -overwrite                              overwrite existing picons file (default - no)
+    -o, --overwrite                              overwrite existing picons file (default - no)
     -d, -debug                                  display work progress and write debug info to file for not found services
     -h, --help                                  this help file