X-Git-Url: http://git.maemo.org/git/?p=comic-widget;a=blobdiff_plain;f=comic-widget.py;h=311db0eb61fedf92772782f1fe238c01111acfba;hp=8b23f5a1208a6cbc0a5a61f46d8adc8b82b6f7a7;hb=145a3ede58582ddf3d6e96b1bdf0d63406e9074d;hpb=7170e651e83e19339e3db66f48e5a500905195ce diff --git a/comic-widget.py b/comic-widget.py index 8b23f5a..311db0e 100644 --- a/comic-widget.py +++ b/comic-widget.py @@ -7,14 +7,18 @@ import urllib import string import os import osso +import cairo +import pango # constants. dbfile is the location of the csv # comiccache is the location of the images -comiccache = "/home/user/MyDocs/comics/" -comics = {"xkcd":{"name":"xkcd","link":"http://xkcd.org/","start":666,"dbfile":"/home/user/.comicdb.xkcd.csv"}, - "sinfest":{"name":"Sinfest","link":"http://sinfest.com/","start":3400,"dbfile":"/home/user/.comicdb.sinfest.csv"}} imagedir = "/home/user/comic-widget/images/" +dbdir = "/home/user/comic-widget/db/" +comiccache = "/home/user/MyDocs/comics/" +comics = {"xkcd":{"name":"xkcd","link":"http://xkcd.org/","start":666,"dbfile":dbdir + ".comicdb.xkcd.csv"}, + "sinfest":{"name":"Sinfest","link":"http://sinfest.com/","start":3400,"dbfile":dbdir + ".comicdb.sinfest.csv"}} + # handling of the comics class ComicDb(): def __init__(self, comic): @@ -117,6 +121,16 @@ class ComicDb(): def fetch_earlier(self, comic, earliest): number = int(earliest) - 1 + irow = self.get_irow(comic, number) + if irow: + print "got irow: " + print irow + print "\ninserting first...\n" + self.insert_row_first(irow) + else: + print "No comic found at " + number + + def get_irow(self, comic, number): if number < 0: return False print "number is now: " + str(number) + "\n" @@ -126,6 +140,7 @@ class ComicDb(): link = "http://www.sinfest.net/archive_page.php?comicID=" + str(number) else: return False + print "link: " + link + "\n" try: f = urllib2.urlopen(link) @@ -136,18 +151,20 @@ class ComicDb(): if (hcode != 200): return False else: - # Build db entry. - # they look like: comic,id,link,url,filename,title - # We already have comic, number/id and link - + # Build db entry. + # they look like: comic,id,link,url,filename,title + # We already have comic, number/id and link + if comic == 'xkcd': s = f.read() f.close() + # This should be done with regex but... splt = string.split(s, "

Image URL (for hotlinking/embedding): ", 1) splt2 = string.split(splt[1], "

", 1) url = splt2[0] splt = string.split(splt[0], "

", 1) splt = string.split(splt[1], "

", 1) + title = splt[0] elif comic == 'sinfest': @@ -163,74 +180,27 @@ class ComicDb(): splt = string.split(splt[1], '" border="0" />', 1) title = splt[0] splt2 = string.rsplit(url, "/", 1) - filename = splt2[1] + filename = splt2[1] irow = [comic,number,link,url,filename,title] - print "got irow: " - print irow - print "\ninserting first...\n" - self.insert_row_first(irow) + return irow + print "got irow: " + def fetch_latest_std(self, comic, latest): - def fetch_latest_std(self, comic, latest): - - print "fetching new after " + str(comic) + " " + str(latest) + "\n" - hcode = 200 - number = int(latest) + 1 - while hcode == 200: - print "number is now: " + str(number) + "\n" - if comic == 'xkcd': - link = "http://xkcd.org/" + str(number) + "/" - elif comic == 'sinfest': - link = "http://www.sinfest.net/archive_page.php?comicID=" + str(number) - else: - break - print "link: " + link + "\n" - try: - f = urllib2.urlopen(link) - hcode = f.code - except: - hcode = 404 - print "got hcode = " + str(hcode) + "\n" - if (hcode != 200): - break - else: - # Build db entry. - # they look like: comic,id,link,url,filename,title - # We already have comic, number/id and link - - if comic == 'xkcd': - s = f.read() - f.close() - splt = string.split(s, "

Image URL (for hotlinking/embedding): ", 1) - splt2 = string.split(splt[1], "

", 1) - url = splt2[0] - splt = string.split(splt[0], "

", 1) - splt = string.split(splt[1], "

", 1) - title = splt[0] - - elif comic == 'sinfest': - s = f.read() - f.close() - splt = string.split(s, 'height="107"', 1) - splt = string.split(splt[1], '', 1) - url = splt[0] - if len(url) < 49: - print ', 1) - title = splt[0] - - splt2 = string.rsplit(url, "/", 1) - filename = splt2[1] - irow = [comic,number,link,url,filename,title] + print "fetching new after " + str(comic) + " " + str(latest) + "\n" + number = int(latest) + 1 + while True: + irow = self.get_irow(comic, number) + if irow: print "got irow: " print irow print "\ninserting...\n" - self.insert_row(irow) + number += 1 + else: + break - number += 1 +# ------------ class ComicHomePlugin(hildondesktop.HomePluginItem): def __init__(self): @@ -241,175 +211,280 @@ class ComicHomePlugin(hildondesktop.HomePluginItem): self.keypointer = 1 self.db = ComicDb(self.keys[self.keypointer]) self.comicname = comics[self.keys[self.keypointer]]['name'] + self.set_name = "comicwidget" screen = self.get_screen() colormap = screen.get_rgba_colormap() self.set_colormap(colormap) + self.set_app_paintable(True) #setup internal area self.set_size_request(480, 230) self.imgvpos = 0; self.vbox = gtk.VBox() self.hbox = gtk.HBox() - self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id'])) + self.label = gtk.Label() + self.label.set_alignment(xalign = 0, yalign = 0.5) + self.label.set_use_markup(True) + titl = str(self.db.db[self.db.currentcomic]['title']) + if len(titl) > 22: + titl = titl[:19] + "..." + self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '') + + self.e_goweb = gtk.EventBox() + self.e_goweb.set_name('goweb') + self.e_goweb.set_size_request(220, 48) + # e_open is the eventbox for the image. Does nothing, but it's convenient to have it. + # it will change to be a cairo thing when I have the time. self.e_open = gtk.EventBox() + self.e_open.set_name('open') self.e_switch = gtk.EventBox() + self.e_switch.set_name('switch') + self.e_switch.set_size_request(48, 48) self.e_next = gtk.EventBox() + self.e_next.set_name('next') + self.e_next.set_size_request(48, 48) self.e_prev = gtk.EventBox() + self.e_prev.set_name('prev') + self.e_prev.set_size_request(48, 48) self.e_up = gtk.EventBox() + self.e_up.set_name('up') + self.e_up.set_size_request(48, 48) self.e_down = gtk.EventBox() + self.e_down.set_name('down') + self.e_down.set_size_request(48, 48) self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) self.comic_image.show() - self.next = gtk.image_new_from_file(imagedir + "right.png") - self.prev = gtk.image_new_from_file(imagedir + "left.png") - self.up = gtk.image_new_from_file(imagedir + "up.png") - self.down = gtk.image_new_from_file(imagedir + "down.png") - self.switch = gtk.image_new_from_file(imagedir + "star.png") + - self.e_goweb.add(self.label) - self.e_goweb.set_events(gtk.gdk.BUTTON_PRESS_MASK) - self.e_goweb.connect("button-press-event", self.view_comic) + # Preload images into a dictionary, so that we can access them by the names of the eventboxes: - self.e_open.add(self.comic_image) + self.images = {'up0':cairo.ImageSurface.create_from_png(imagedir + "up0-48x48.png"), + 'up1':cairo.ImageSurface.create_from_png(imagedir + "up1-48x48.png"), + 'down0':cairo.ImageSurface.create_from_png(imagedir + "down0-48x48.png"), + 'down1':cairo.ImageSurface.create_from_png(imagedir + "down1-48x48.png"), + 'next0':cairo.ImageSurface.create_from_png(imagedir + "next0-48x48.png"), + 'next1':cairo.ImageSurface.create_from_png(imagedir + "next1-48x48.png"), + 'prev0':cairo.ImageSurface.create_from_png(imagedir + "prev0-48x48.png"), + 'prev1':cairo.ImageSurface.create_from_png(imagedir + "prev1-48x48.png"), + 'switch0':cairo.ImageSurface.create_from_png(imagedir + "switch0-48x48.png"), + 'switch1':cairo.ImageSurface.create_from_png(imagedir + "switch1-48x48.png"), + } - self.e_switch.add(self.switch) - self.e_switch.set_events(gtk.gdk.BUTTON_PRESS_MASK) - self.e_switch.connect("button-press-event", self.switch_comic) - self.e_next.add(self.next) - self.e_next.set_events(gtk.gdk.BUTTON_PRESS_MASK) - self.e_next.connect("button-press-event", self.get_next) + self.e_goweb.add(self.label) + self.e_goweb.set_events(gtk.gdk.BUTTON_RELEASE_MASK) + self.e_goweb.connect("button-release-event", self.view_comic) - self.e_prev.add(self.prev) - self.e_prev.set_events(gtk.gdk.BUTTON_PRESS_MASK) - self.e_prev.connect("button_press_event", self.get_prev) + self.e_open.add(self.comic_image) - self.e_up.add(self.up) - self.e_up.set_events(gtk.gdk.BUTTON_PRESS_MASK) - self.e_up.connect("button-press-event", self.scroll_up) + # self.e_switch.add(self.switch) + self.e_switch.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY) + self.e_switch.connect("button-press-event", self.button_press) + self.e_switch.connect("button-release-event", self.button_release) + self.e_switch.connect("leave-notify-event", self.button_release) + + + # self.e_next.add(self.next) + self.e_next.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY) + self.e_next.connect("button-press-event", self.button_press) + self.e_next.connect("button-release-event", self.button_release) + self.e_next.connect("leave-notify-event", self.button_release) + + #self.e_prev.add(self.prev) + self.e_prev.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY) + self.e_prev.connect("button-press-event", self.button_press) + self.e_prev.connect("button-release-event", self.button_release) + self.e_prev.connect("leave-notify-event", self.button_release) + + #self.e_up.add(self.up) + self.e_up.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY) + self.e_up.connect("button-press-event", self.button_press) + self.e_up.connect("button-release-event", self.button_release) + self.e_up.connect("leave-notify-event", self.button_release) + - self.e_down.add(self.down) - self.e_down.set_events(gtk.gdk.BUTTON_PRESS_MASK) - self.e_down.connect("button-press-event", self.scroll_down) + #self.e_down.add(self.down) + self.e_down.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY) + self.e_down.connect("button-press-event", self.button_press) + self.e_down.connect("button-release-event", self.button_release) + self.e_down.connect("leave-notify-event", self.button_release) self.vbox.pack_start(self.e_open,False,False,0) self.vbox.pack_end(self.hbox,False,False,0) - self.hbox.pack_start(self.e_switch,False,False,5) - self.hbox.pack_start(self.e_goweb,False,False,5) - self.hbox.pack_end(self.e_next,False,False,5) - self.hbox.pack_end(self.e_down,False,False,5) - self.hbox.pack_end(self.e_up,False,False,5) - self.hbox.pack_end(self.e_prev,False,False,5) + self.hbox.pack_start(self.e_switch,False,False,0) + self.hbox.pack_start(self.e_goweb,False,False,10) + self.hbox.pack_end(self.e_next,False,False,0) + self.hbox.pack_end(self.e_prev,False,False,0) + self.hbox.pack_end(self.e_down,False,False,0) + self.hbox.pack_end(self.e_up,False,False,0) self.vbox.show_all() self.add(self.vbox) + # **************** Cairo draw functions *************** - def switch_comic(self, widget, event): + def realize(self): + screen = self.get_screen() + colormap = screen.get_rgba_colormap() + self.set_colormap(colormap) + return None + + def do_expose_event(widget, event): + cr = widget.window.cairo_create() + widget.draw(widget.e_up, 0) + widget.draw(widget.e_down, 0) + widget.draw(widget.e_prev,0) + widget.draw(widget.e_next, 0) + widget.draw(widget.e_switch, 0) +# widget.writeit(widget.e_goweb, "asdf") + cr.set_operator(cairo.OPERATOR_OVER) + region = gtk.gdk.region_rectangle(event.area) + cr.region(region) + bg_color=gtk.gdk.color_parse('#000000') + cr.set_source_rgba (0.0, 0.0, 0.0, 0.5) + cr.fill_preserve() + return False + + # Function that draws a button preloaded in the images dictionary. + def draw(self, target, postfix): + cr_e = target.window.cairo_create() + cr_e.set_source_rgba(0.0, 0.0, 0.0, 0.5) # Transparent + cr_e.set_operator(cairo.OPERATOR_SOURCE) + cr_e.paint() + cr_e.set_operator(cairo.OPERATOR_OVER) + cr_e.set_source_surface(self.images[target.get_name() + str(postfix)], 0, 0) + cr_e.paint() + + # ********** Event handlers ************* + + + # Most events happen on release, so I moved all of them into the same event handler. + def button_release(self, widget, event): + if event.type == gtk.gdk.BUTTON_RELEASE: + func = widget.get_name() + print "pressed: " + func + if func == 'up': + self.e_open.remove(self.comic_image) + self.imgvpos = self.imgvpos - 80 + if self.imgvpos < 0: + self.imgvpos = 0 + self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) + self.e_open.add(self.comic_image) + self.e_open.show_all() + + elif func == 'down': + self.e_open.remove(self.comic_image) + self.imgvpos = self.imgvpos + 80 + self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) + self.e_open.add(self.comic_image) + self.e_open.show_all() + + elif func == 'next': + self.db.currentcomic -= 1 + self.imgvpos = 0 + self.e_open.remove(self.comic_image) + self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) + self.e_open.add(self.comic_image) + self.e_open.show_all() + self.e_goweb.remove(self.label) + titl = str(self.db.db[self.db.currentcomic]['title']) + if len(titl) > 22: + titl = titl[:19] + "..." + self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '') + self.e_goweb.add(self.label) + self.e_goweb.show_all() + + elif func == 'prev': + self.db.currentcomic += 1 + self.imgvpos = 0 + self.e_open.remove(self.comic_image) + self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) + self.e_open.add(self.comic_image) + self.e_open.show_all() + self.e_goweb.remove(self.label) + titl = str(self.db.db[self.db.currentcomic]['title']) + if len(titl) > 22: + titl = titl[:19] + "..." + self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '') + self.e_goweb.add(self.label) + self.e_goweb.show_all() + + elif func == 'switch': + self.keypointer = (self.keypointer + 1) % 2 + self.imgvpos = 0 + self.db = [] + print "switching to " + self.keys[self.keypointer] + self.comicname = comics[self.keys[self.keypointer]]['name'] + self.db = ComicDb(self.keys[self.keypointer]) + self.e_goweb.remove(self.label) + titl = str(self.db.db[self.db.currentcomic]['title']) + if len(titl) > 22: + titl = titl[:19] + "..." + self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '') + self.e_goweb.add(self.label) + self.e_goweb.show_all() + self.e_open.remove(self.comic_image) + self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) + self.e_open.add(self.comic_image) + self.e_open.show_all() + + else: + return False + self.draw(widget, "0") + + # this one only switches to pressed button image + def button_press(self, widget, event): if not event.type == gtk.gdk.BUTTON_PRESS: return False - self.keypointer = (self.keypointer + 1) % 2 - self.imgvpos = 0 - self.db = [] - print "switching to " + self.keys[self.keypointer] - self.comicname = comics[self.keys[self.keypointer]]['name'] - self.db = ComicDb(self.keys[self.keypointer]) - self.e_goweb.remove(self.label) - self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id'])) - self.e_goweb.add(self.label) - self.e_goweb.show_all() - self.e_open.remove(self.comic_image) - self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) - self.e_open.add(self.comic_image) - self.e_open.show_all() + self.draw(widget, "1") - def switch_rel(self, widget, event): - if not event.type == gtk.gdk.BUTTON_RELEASE: + # this one cancels a button press when pointer is moved out from it after press. + def button_out(self, widget, event): + if not event.type == gtk.gdk.BUTTON_PRESS: return False - widget.remove(self.switch) - self.switch = gtk.image_new_from_file(imagedir + "star.png") - widget.add(self.switch) - widget.show_all() + self.draw(widget, "0") + # no fancy cairo stuff here. simply launches url in browser. def view_comic(self, widget, event): - if not event.type == gtk.gdk.BUTTON_PRESS: + if not event.type == gtk.gdk.BUTTON_RELEASE: return False link = self.db.get_link() self.osso_rpc.rpc_run_with_defaults("osso_browser", "open_new_window", (link,)) - def scroll_down(self, widget, event): - if not event.type == gtk.gdk.BUTTON_PRESS: - return False - self.e_open.remove(self.comic_image) - self.imgvpos = self.imgvpos + 50 - self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) - self.e_open.add(self.comic_image) - self.e_open.show_all() - def scroll_up(self, widget, event): - if not event.type == gtk.gdk.BUTTON_PRESS: - return False - self.e_open.remove(self.comic_image) - self.imgvpos = self.imgvpos - 50 - if self.imgvpos < 0: - self.imgvpos = 0 - self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) - self.e_open.add(self.comic_image) - self.e_open.show_all() - def get_next(self, widget, event): - if not event.type == gtk.gdk.BUTTON_PRESS: - return False - self.db.currentcomic -= 1 - self.imgvpos = 0 - self.e_open.remove(self.comic_image) - self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) - self.e_open.add(self.comic_image) - self.e_open.show_all() - self.e_goweb.remove(self.label) - self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id'])) - self.e_goweb.add(self.label) - self.e_goweb.show_all() - - def get_prev(self, widget, event): - if not event.type == gtk.gdk.BUTTON_PRESS: - return False - self.db.currentcomic += 1 - self.imgvpos = 0 - self.e_open.remove(self.comic_image) - self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos) - self.e_open.add(self.comic_image) - self.e_open.show_all() - self.e_goweb.remove(self.label) - self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id'])) - self.e_goweb.add(self.label) - self.e_goweb.show_all() + # this function modifies the image to fit the widget and then returns it. def get_resized_pixmap(self, filename, vpos): + print "vpos: " + str(vpos) + + maxheight = 182 + pixbuf = gtk.gdk.pixbuf_new_from_file(filename) - parent_buf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, pixbuf.get_has_alpha(), 8, 478, 190) - parent_buf.fill(0x00000000) + parent_buf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, pixbuf.get_has_alpha(), 8, 480, maxheight) + parent_buf.fill(0xffffffff) retimg = gtk.Image() # get correct width/height - new_width = 0 new_height = 1 new_width = 478 new_height = int((478.0 / pixbuf.get_width()) * pixbuf.get_height()) scaled_buf = pixbuf.scale_simple(new_width,new_height,gtk.gdk.INTERP_BILINEAR) - - if scaled_buf.get_height() > 190: - if scaled_buf.get_height() - (vpos + 190) < 0: - vpos = scaled_buf.get_height() - 190 - scaled_buf.copy_area(0,vpos,478,190,parent_buf,0,0) - + print "scaled height: " + str(scaled_buf.get_height()) + if scaled_buf.get_height() > maxheight: + if scaled_buf.get_height() - (vpos + maxheight) < 0: + vpos = scaled_buf.get_height() - maxheight + scaled_buf.copy_area(0,vpos,478,maxheight,parent_buf,1,0) + self.imgvpos = vpos else: - tmpy = 190 - scaled_buf.get_height() + tmpy = maxheight - scaled_buf.get_height() if tmpy > 0: tmpy = tmpy / 2 - scaled_buf.copy_area(0,vpos,478,scaled_buf.get_height(),parent_buf,0,tmpy) - + scaled_buf.copy_area(0,0,478,scaled_buf.get_height(),parent_buf,1,tmpy) + self.imgvpos = 0 retimg.set_from_pixbuf(parent_buf) + print "vpos after fixing image: " + str(self.imgvpos) return retimg