[maemo-commits] [maemo-commits] r16272 - in projects/haf/branches/hildon-thumbnail/daemonize: . albumart-providers albumart-providers/googleimages tests
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Sep 29 16:18:45 EEST 2008
- Previous message: [maemo-commits] r16271 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon tests
- Next message: [maemo-commits] r16273 - projects/haf/trunk/sapwood
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2008-09-29 16:18:41 +0300 (Mon, 29 Sep 2008) New Revision: 16272 Added: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/ projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/Makefile.am projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/ projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/Makefile.am projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/com.nokia.albumart.AlbumartProvider.GoogleImages.service projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/com.nokia.albumart.GoogleImages.service.in projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/google-images-art-downloader.vala Removed: projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.GoogleImages.service.in projects/haf/branches/hildon-thumbnail/daemonize/tests/google-images-art-downloader.vala Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am projects/haf/branches/hildon-thumbnail/daemonize/configure.ac projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am Log: 2008-09-29 Philip Van Hoof <pvanhoof at gnome.org> * albumart-providers * albumart-providers/googleimages * albumart-providers/googleimages/google-images-art-downloader.vala * albumart-providers/googleimages/com.nokia.albumart.AlbumartProvider.GoogleImages.service * albumart-providers/googleimages/com.nokia.albumart.GoogleImages.service.in * albumart-providers/googleimages/Makefile.am * albumart-providers/Makefile.am * tests/google-images-art-downloader.vala * tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service * tests/Makefile.am * tests/com.nokia.albumart.GoogleImages.service.in * configure.ac * Makefile.am: Moving things around Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-29 13:18:41 UTC (rev 16272) @@ -1,6 +1,22 @@ 2008-09-29 Philip Van Hoof <pvanhoof at gnome.org> + * albumart-providers + * albumart-providers/googleimages + * albumart-providers/googleimages/google-images-art-downloader.vala + * albumart-providers/googleimages/com.nokia.albumart.AlbumartProvider.GoogleImages.service + * albumart-providers/googleimages/com.nokia.albumart.GoogleImages.service.in + * albumart-providers/googleimages/Makefile.am + * albumart-providers/Makefile.am + * tests/google-images-art-downloader.vala + * tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service * tests/Makefile.am + * tests/com.nokia.albumart.GoogleImages.service.in + * configure.ac + * Makefile.am: Moving things around + +2008-09-29 Philip Van Hoof <pvanhoof at gnome.org> + + * tests/Makefile.am * daemon/albumart.c * daemon/albumart-manager.c: Various small bugfixes that make the requester work Modified: projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am 2008-09-29 13:18:41 UTC (rev 16272) @@ -1,4 +1,4 @@ -SUBDIRS = daemon thumbs doc +SUBDIRS = daemon thumbs albumart-providers doc EXTRA_DIST = debian/changelog debian/control debian/copyright debian/rules \ debian/hildon-thumbnail.install \ Property changes on: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers ___________________________________________________________________ Name: svn:ignore + Makefile Makefile.in Added: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/Makefile.am =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/Makefile.am 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/Makefile.am 2008-09-29 13:18:41 UTC (rev 16272) @@ -0,0 +1,2 @@ +SUBDIRS = googleimages + Property changes on: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages ___________________________________________________________________ Name: svn:ignore + google-images-art-downloader.c Makefile.in com.nokia.albumart.GoogleImages.service google-images-art-downloader.h .libs .deps my.vala.stamp Makefile hildon-google-images-art-downloaderd Added: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/Makefile.am =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/Makefile.am 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/Makefile.am 2008-09-29 13:18:41 UTC (rev 16272) @@ -0,0 +1,47 @@ +SUBDIRS = . + +INCLUDES = -I$(srcdir)/../thumbs -I$(srcdir)/.. $(PKG_CFLAGS) \ + $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(GIO_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) + +NULL = +BUILT_SOURCES = my.vala.stamp + +EXTRA_DIST = $(BUILT_SOURCES) \ + $(com.nokia.albumart.GoogleImages_service_DATA) + +libexec_PROGRAMS = hildon-google-images-art-downloaderd + +hildon_google_images_art_downloaderd_VALASOURCES = \ + google-images-art-downloader.vala + +hildon_google_images_art_downloaderd_SOURCES = \ + my.vala.stamp \ + $(hildon_google_images_art_downloaderd_VALASOURCES:.vala=.c) \ + $(hildon_google_images_art_downloaderd_VALASOURCES:.vala=.h) \ + $(NULL) + +google-images-art-downloader.vala my.vala.stamp: $(hildon_google_images_art_downloaderd_VALASOURCES) + $(VALAC) -C --basedir $(top_srcdir) \ + --pkg=gee-1.0 \ + --pkg=hildon-1 \ + --pkg=dbus-glib-1 \ + $^ + touch $@ + +hildon_google_images_art_downloaderd_LDADD = \ + $(DBUS_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GIO_LIBS) + +# Services +com.nokia.albumart.GoogleImages_servicedir = $(DBUS_SERVICES_DIR) +com.nokia.albumart.GoogleImages_service_DATA = com.nokia.albumart.GoogleImages.service + +%.service: %.service.in + @sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@ + +CLEANFILES = $(BUILT_SOURCES) \ + $(org.freedesktop.thumbnailer_service_DATA) + +albartdowndir = /usr/share/albumart-providers +albartdown_DATA = com.nokia.albumart.AlbumartProvider.GoogleImages.service + Copied: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/com.nokia.albumart.AlbumartProvider.GoogleImages.service (from rev 16266, projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service) Copied: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/com.nokia.albumart.GoogleImages.service.in (from rev 16266, projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.GoogleImages.service.in) Copied: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/google-images-art-downloader.vala (from rev 16256, projects/haf/branches/hildon-thumbnail/daemonize/tests/google-images-art-downloader.vala) Modified: projects/haf/branches/hildon-thumbnail/daemonize/configure.ac =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/configure.ac 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/configure.ac 2008-09-29 13:18:41 UTC (rev 16272) @@ -96,6 +96,8 @@ AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) +AC_PATH_PROG(VALAC, valac, valac) + gtk_doc_min_version=0.10 if $GTKDOC ; then gtk_doc_version=`gtkdoc-mkdb --version` @@ -160,5 +162,7 @@ tests/Makefile \ daemon/Makefile \ daemon/plugins/Makefile \ - thumbs/Makefile \ + thumbs/Makefile \ + albumart-providers/Makefile \ + albumart-providers/googleimages/Makefile \ hildon-thumbnail.pc) Modified: projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am 2008-09-29 13:18:41 UTC (rev 16272) @@ -1,36 +1,11 @@ -SUBDIRS = . - INCLUDES = -I$(srcdir)/../thumbs -I$(srcdir)/.. $(PKG_CFLAGS) \ $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(GIO_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) -NULL = -BUILT_SOURCES = my.vala.stamp daemon-glue.h +BUILT_SOURCES = daemon-glue.h bin_PROGRAMS = hildon-thumbnail-tester hildon-thumbnail-daemon-plugin-test -libexec_PROGRAMS = hildon-google-images-art-downloaderd - -hildon_google_images_art_downloaderd_VALASOURCES = \ - google-images-art-downloader.vala - -hildon_google_images_art_downloaderd_SOURCES = \ - my.vala.stamp \ - $(hildon_google_images_art_downloaderd_VALASOURCES:.vala=.c) \ - $(hildon_google_images_art_downloaderd_VALASOURCES:.vala=.h) \ - $(NULL) - -google-images-art-downloader.vala my.vala.stamp: $(hildon_google_images_art_downloaderd_VALASOURCES) - $(VALAC) -C --basedir $(top_srcdir) \ - --pkg=gee-1.0 \ - --pkg=hildon-1 \ - --pkg=dbus-glib-1 \ - $^ - touch $@ - -hildon_google_images_art_downloaderd_LDADD = \ - $(DBUS_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GIO_LIBS) - hildon_thumbnail_daemon_plugin_test_SOURCES = daemon.c daemon-glue.h hildon_thumbnail_daemon_plugin_test_LDADD = $(top_builddir)/thumbs/libhildonthumbnail.la $(DBUS_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GIO_LIBS) @@ -39,24 +14,11 @@ hildon_thumbnail_tester_LDADD = $(top_builddir)/thumbs/libhildonthumbnail.la $(PKG_LIBS) \ $(GDK_PIXBUF_LIBS) - %-glue.h: $(top_srcdir)/tests/%.xml $(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ -EXTRA_DIST = $(BUILT_SOURCES) daemon.xml my.vala.stamp \ - $(com.nokia.albumart.GoogleImages_service_DATA) +EXTRA_DIST = $(BUILT_SOURCES) daemon.xml +CLEANFILES = $(BUILT_SOURCES) -# Services -com.nokia.albumart.GoogleImages_servicedir = $(DBUS_SERVICES_DIR) -com.nokia.albumart.GoogleImages_service_DATA = com.nokia.albumart.GoogleImages.service -%.service: %.service.in - @sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@ - -CLEANFILES = $(BUILT_SOURCES) \ - $(org.freedesktop.thumbnailer_service_DATA) - -albartdowndir = /usr/share/albumart-providers -albartdown_DATA = com.nokia.albumart.AlbumartProvider.GoogleImages.service - Deleted: projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service 2008-09-29 13:18:41 UTC (rev 16272) @@ -1,3 +0,0 @@ -[D-BUS Album art provider] -Name=com.nokia.albumart.GoogleImages - Deleted: projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.GoogleImages.service.in =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.GoogleImages.service.in 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/tests/com.nokia.albumart.GoogleImages.service.in 2008-09-29 13:18:41 UTC (rev 16272) @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.nokia.albumart.GoogleImages -Exec=@libexecdir@/hildon-google-images-art-downloaderd Deleted: projects/haf/branches/hildon-thumbnail/daemonize/tests/google-images-art-downloader.vala =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/tests/google-images-art-downloader.vala 2008-09-29 13:06:10 UTC (rev 16271) +++ projects/haf/branches/hildon-thumbnail/daemonize/tests/google-images-art-downloader.vala 2008-09-29 13:18:41 UTC (rev 16272) @@ -1,125 +0,0 @@ -using GLib; - -// This is the interface on DBus that you must implement - -[DBus (name = "com.nokia.albumart.Provider")] -public interface Provider { - public abstract void Fetch (string artistalbum, string uri); -} - -// Sample implementation of com.nokia.albumart.Provider that uses Google -// images's first result as album-art cover. There is of course no certainty -// that the first result on Google images is indeed the album's cover. But it's -// a good estimate nonetheless. - -public class GoogleImages : Object, Provider { - - public void Fetch (string artistalbum, string uri) { - uint u = 0, hread = 0; - string [] pieces = artistalbum.split (" ", -1); - string stitched = ""; - - // Convert the album-artist into something that will work for Google images - - while (pieces[u] != null) { - if (u != 0) - stitched += "+"; - stitched += pieces[u]; - u++; - } - - // Start the query on Google images - - File google_search = File.new_for_uri ("http://images.google.com/images?q=" + stitched); - - try { - char [] buffer = new char [40000]; - string asstring; - - // Fetch the first page - - InputStream stream = google_search.read (null); - stream.read_all (buffer, 40000, out hread, null); - buffer[hread] = 0; - - asstring = (string) buffer; - - // Find the first result - - string found = asstring.str ("http://tbn0.google.com/images?q=tbn"); - - if (found != null) { - - StringBuilder url = new StringBuilder (); - long y = found.len(); - int i = 0; - - while (found[i] != ' ' && i < y) { - url.append_unichar (found[i]); - i++; - } - - string cache_path; - - string cache_dir = Path.build_filename (Environment.get_home_dir(), - ".album_art", - null); - - // Define cache path = ~/.album_art/MD5 (down (albumartist)).jpeg - - cache_path = Path.build_filename (Environment.get_home_dir(), - ".album_art", - Checksum.compute_for_string ( - ChecksumType.MD5, - artistalbum.down () + ".jpeg", - -1), - null); - - // Make sure the directory .album_arts is available - - DirUtils.create_with_parents (cache_dir, 0770); - - File online_image = File.new_for_uri (url.str); - File cache_image = File.new_for_path (cache_path); - - // Copy from Google images to local cache - - online_image.copy (cache_image, - FileCopyFlags.NONE, - null, - null); - } - - } catch (GLib.Error error) { - } - } -} - -void main () -{ - MainLoop loop = new MainLoop (null, false); - - try { - var conn = DBus.Bus.get (DBus.BusType. SESSION); - - dynamic DBus.Object bus = conn.get_object ( - "org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus"); - - // try to register service in session bus - - uint request_name_result = bus.request_name ("com.nokia.albumart.GoogleImages", (uint) 0); - - if (request_name_result == DBus.RequestNameReply.PRIMARY_OWNER) { - - // start server - - var server = new GoogleImages (); - conn.register_object ("/com/nokia/albumart/GoogleImages", server); - - loop.run (); - } - } catch (Error foo) { - stderr.printf("Oops %s\n", foo.message); - } -} -
- Previous message: [maemo-commits] r16271 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon tests
- Next message: [maemo-commits] r16273 - projects/haf/trunk/sapwood
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]