use ePicLoad, use tabs for indentation

[vuplus_dvbapp-plugin] / googlemaps / src / WebPixmap.py

diff --git a/googlemaps/src/WebPixmap.py b/googlemaps/src/WebPixmap.py
index a233429..2698bec 100644 (file)
--- a/googlemaps/src/WebPixmap.py
+++ b/googlemaps/src/WebPixmap.py
@@ -1,4 +1,4 @@
-from enigma import loadPic,ePixmap, getDesktop
+from enigma import ePicLoad, ePixmap, getDesktop
 from Components.Pixmap import Pixmap
 from twisted.web.client import downloadPage
 from urllib import quote_plus
@@ -8,80 +8,62 @@ from os.path import isdir as os_path_isdir, isfile as os_isfile
 from Components.AVSwitch import AVSwitch
 from Components.config import config
 
-def getAspect():
-    val = AVSwitch().getAspectRatioSetting()
-    if val == 0:
-        r = 3
-    elif val == 1:
-        r = 3
-    elif val == 2:
-        r = 1
-    elif val == 3:
-        r = 1
-    elif val == 4:
-        r = 2
-    elif val == 5:
-        r = 2
-    elif val == 6:
-        r = 1
-    return r
-
 class WebPixmap(Pixmap):
-    def __init__(self,default=None):
-        self.default = default
-        self.cachedir = "/tmp/googlemaps/"
-        Pixmap.__init__(self)
+       def __init__(self, default = None):
+               Pixmap.__init__(self)
+               self.picload = ePicLoad()
+               self.picload.PictureData.get().append(self.setPixmapCB)
+               self.cachedir = "/tmp/googlemaps/"
+               self.default = default
+
+       def onShow(self):
+               Pixmap.onShow(self)
+               sc = AVSwitch().getFramebufferScale()
+               resize = True
+               background = '#ff000000'
+               self.picload.setPara((self.instance.size().height(), self.instance.size().width(), sc[0], sc[1], False, resize, background))
 
-    def load(self,url=None):
-        self.url = url
-        tmpfile = self.cachedir+quote_plus(url)+".jpg"
-        if os_path_isdir(self.cachedir) is False:
-            print "cachedir not existing, creating it"
-            os_mkdir(self.cachedir)
-        if os_isfile(tmpfile):
-            self.tmpfile = tmpfile
-            self.onLoadFinished(None)
-        elif url is not None:
-            self.tmpfile = tmpfile
-            head = {
-                       "Accept":"image/png,image/*;q=0.8,*/*;q=0.5",
-                       "Accept-Language":"de",
-                       "Accept-Encoding":"gzip,deflate",
-                       "Accept-Charset":"ISO-8859-1,utf-8;q=0.7,*;q=0.7",
-                       "Keep-Alive":"300",
-                       "Referer":"http://maps.google.de/",
-                       "Cookie:": "khcookie=fzwq1BaIQeBvxLjHsDGOezbBcCBU1T_t0oZKpA; PREF=ID=a9eb9d6fbca69f5f:TM=1219251671:LM=1219251671:S=daYFLkncM3cSOKsF; NID=15=ADVC1mqIWQWyJ0Wz655SirSOMG6pXP2ocdXwdfBZX56SgYaDXNNySnaOav-6_lE8G37iWaD7aBFza-gsX-kujQeH_8WTelqP9PpaEg0A_vZ9G7r50tzRBAZ-8GUwnEfl",
-                       "Connection":"keep-alive"
-                       }
-            agt = "Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.0.2) Gecko/2008091620 Firefox/3.0.2"
-            downloadPage(url,self.tmpfile,headers=head,agent=agt).addCallback(self.onLoadFinished).addErrback(self.onLoadFailed)
-        else:
-            if self.default is not None:
-                self.setPixmapFromFile(self.default)
+       def load(self, url = None):
+               tmpfile = ''.join((self.cachedir, quote_plus(url), '.jpg'))
+               if os_path_isdir(self.cachedir) is False:
+                       print "cachedir not existing, creating it"
+                       os_mkdir(self.cachedir)
+               if os_isfile(tmpfile):
+                       self.tmpfile = tmpfile
+                       self.onLoadFinished(None)
+               elif url is not None:
+                       self.tmpfile = tmpfile
+                       head = {
+                               "Accept":"image/png,image/*;q=0.8,*/*;q=0.5",
+                               "Accept-Language":"de",
+                               "Accept-Encoding":"gzip,deflate",
+                               "Accept-Charset":"ISO-8859-1,utf-8;q=0.7,*;q=0.7",
+                               "Keep-Alive":"300",
+                               "Referer":"http://maps.google.de/",
+                               "Cookie:": "khcookie=fzwq1BaIQeBvxLjHsDGOezbBcCBU1T_t0oZKpA; PREF=ID=a9eb9d6fbca69f5f:TM=1219251671:LM=1219251671:S=daYFLkncM3cSOKsF; NID=15=ADVC1mqIWQWyJ0Wz655SirSOMG6pXP2ocdXwdfBZX56SgYaDXNNySnaOav-6_lE8G37iWaD7aBFza-gsX-kujQeH_8WTelqP9PpaEg0A_vZ9G7r50tzRBAZ-8GUwnEfl",
+                               "Connection":"keep-alive"
+                       }
+                       agt = "Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.0.2) Gecko/2008091620 Firefox/3.0.2"
+                       downloadPage(url,self.tmpfile,headers=head,agent=agt).addCallback(self.onLoadFinished).addErrback(self.onLoadFailed)
+               elif self.default:
+                       self.picload.startDecode(self.default)
 
-    def onLoadFinished(self,result):
-        self.setPixmapFromFile(self.tmpfile)
-        if os_isfile(self.tmpfile):
-            if config.plugins.GoogleMaps.cache_enabled.value is not True:
-                os_remove(self.tmpfile)
+       def onLoadFinished(self,result):
+               self.picload.startDecode(self.tmpfile)
 
-    def onLoadFailed(self,error):
-        print "WebPixmap:onLoadFAILED",error
-        if self.default is not None:
-            print "showing 404",self.default
-            self.setPixmapFromFile(self.default)
-        if os_isfile(self.tmpfile):
-            os_remove(self.tmpfile)
+       def onLoadFailed(self,error):
+               print "WebPixmap:onLoadFAILED", error
+               if self.default and self.instance:
+                       print "showing 404", self.default
+                       self.picload.startDecode(self.default)
+               if os_isfile(self.tmpfile):
+                       os_remove(self.tmpfile)
 
-    def setPixmapFromFile(self,file):
-        if self.instance is not None:
-            h = self.instance.size().height()
-            w = self.instance.size().width()
-            aspect = getAspect()
-            resize = 1
-            rotate = 0
-            background = 1
-            self.pixmap = loadPic(file, w,h,aspect,resize, rotate,background)
-            if self.pixmap is not None:
-                self.instance.setPixmap(self.pixmap.__deref__())
+       def setPixmapCB(self, picInfo = None):
+               if os_isfile(self.tmpfile):
+                       if config.plugins.GoogleMaps.cache_enabled.value is not True:
+                               os_remove(self.tmpfile)
+               ptr = self.picload.getData()
+               if ptr and self.instance:
+                       self.instance.setPixmap(ptr.__deref__())