X-Git-Url: http://git.maemo.org/git/?p=comic-widget;a=blobdiff_plain;f=src%2Fusr%2Flib%2Fhildon-desktop%2Fcomicwidget.py;h=5dd1fe65e91007397c30222ae6613941915d6379;hp=c4c822873292d9eb93ebce5d6e97d40661b4a968;hb=1e95ad9439ae6395d900e5a029fa7351f5c1ea57;hpb=2c5d4b523e80bd9d81ad66b9c89c2400b6466fa1

diff --git a/src/usr/lib/hildon-desktop/comicwidget.py b/src/usr/lib/hildon-desktop/comicwidget.py
index c4c8228..5dd1fe6 100644
--- a/src/usr/lib/hildon-desktop/comicwidget.py
+++ b/src/usr/lib/hildon-desktop/comicwidget.py
@@ -18,8 +18,8 @@ socket.setdefaulttimeout(30)
 supports_alpha = False
 
 # LOGGING!
-# sys.stdout = open('/home/user/.comic-widget/output_log.txt', 'a')
-# sys.stderr = open('/home/user/.comic-widget/error_log.txt', 'a')
+# sys.stdout = open('/home/user/.comic-widget/output_log.txt', 'a', 0)
+sys.stderr = open('/home/user/.comic-widget/error_log.txt', 'a', 0)
 # print "Start logging!"
 
 # constants. dbfile is the location of the csv
@@ -199,6 +199,7 @@ comics = {
 		"tigerckdm":{"name":"Tiger","link":'http://content.comicskingdom.net/Tiger/',"start":"20100209","dbfile":dbdir + "comicdb.tiger.csv"},
 		"tinas_grooveckdm":{"name":"Tina's Groove","link":'http://content.comicskingdom.net/Tinas_Groove/',"start":"20100209","dbfile":dbdir + "comicdb.tinasgroove.csv"},
 		"toddckdm":{"name":"Todd the Dinosaur","link":'http://content.comicskingdom.net/Todd/',"start":"20100209","dbfile":dbdir + "comicdb.todd.csv"},
+		"viivijawagnermatinmaapallo":{"name":"Viivi ja Wagner","link":"http://matin.maapallo.org/site.pl/selain/?c=viivijawagner&i=","start":"2500","dbfile":dbdir + "comicdb.viivijawagner.csv"},
 		"zippy_the_pinheadckdm":{"name":"Zippy the Pinhead","link":'http://content.comicskingdom.net/Zippy_the_Pinhead/',"start":"20100209","dbfile":dbdir + "comicdb.zippythepinhead.csv"},
 		"zitsckdm":{"name":"Zits","link":'http://content.comicskingdom.net/Zits/',"start":"20100209","dbfile":dbdir + "comicdb.zits.csv"},
 
@@ -645,7 +646,35 @@ class ComicDb():
 				s = f.read()
 				f.close()
 				return self.parse_comics_com(comic, s, 'next')
-
+		elif comic[-13:] == "matinmaapallo":
+			realcomic = string.split( comic, 'matinmaapallo', 1)
+			linkname = realcomic[0]
+			link = "http://matin.maapallo.org/site.pl/selain/?c=" + linkname + "&i=" + str(number)
+			print "link: " + link
+			try:
+				f = urllib2.urlopen(link)
+				hcode = f.code
+			except:
+				hcode = 404
+			print "got hcode = " + str(hcode) + "\n"
+			print "I am now here"
+			if (hcode != 200):
+				return False
+			else:
+				print "checking next matin maapallo issue.."
+				s = f.read()
+				f.close()
+				# title:
+				splt = string.split(s, 'seuraava', 1)
+				if len(splt) < 2:
+					print "no 'prev' found"
+					return False
+				else:
+					next = str( int(number) + 1 )
+					print "got next: " + next
+					return next
+		else:
+			return False
 
 
 
@@ -744,8 +773,18 @@ class ComicDb():
 				s = f.read()
 				f.close()
 				return self.parse_comics_com(comic, s, 'prev')
-
-
+		elif comic[-13:] == 'matinmaapallo':
+			print "checking matin maapallo..."
+                        prevint = int( number ) - 1
+			if ( prevint  == 0 ):
+				print "cannot go previous"
+				return False
+			else:
+				print "got number: " + number
+				print "got previous: " + str(prevint)
+				return str(prevint)
+		else:
+			return False
 
 
 	def get_irow(self, comic, number):
@@ -1315,11 +1354,18 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
 		height = int(self.sizes['height'])
 		picwidth = width - 2
 		maxheight = height - 48
-
+		retimg = gtk.Image()
+		if os.path.isfile(filename) == False:
+			filename = "/opt/comic-widget/images/up0-48x48.png"
+		  	pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
+			parent_buf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, pixbuf.get_has_alpha(), 8, width, maxheight)
+			parent_buf.fill(0x00000000)
+			tmpy = (maxheight / 2) - 24
+			tmpx = (width / 2) - 24
+			pixbuf.copy_area(0,0,picwidth,scaled_buf.get_height(),parent_buf,int(tmpx),int(tmpy))
+			return 
 	  	pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
 		parent_buf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, pixbuf.get_has_alpha(), 8, width, maxheight)
-		parent_buf.fill(0xffffffff)
-		retimg = gtk.Image()
 		# get correct width/height
 		new_height = 1
 		new_width = picwidth