diff -Nru exaile-0.2.11.1/data/settings_meta.ini exaile-0.2.13/data/settings_meta.ini --- exaile-0.2.11.1/data/settings_meta.ini 2007-11-07 11:11:35.000000000 -0500 +++ exaile-0.2.13/data/settings_meta.ini 2008-04-01 21:23:02.000000000 -0400 @@ -6,6 +6,7 @@ ui/show_files_panel Boolean True Show Files Panel toggle_panel ui/show_playlists_panel Boolean True Show Playlists Panel toggle_panel ui/always_show_tabbar Boolean False Always Show Playlist Tab Bar toggle_tabbar +ui/show_cover Boolean True Show cover art toggle_cover osd/text_color Str #ffffff Text color in the On Screen Display none osd/enabled Boolean True Show On Screen Display none osd/w Int 400 On Screen Display Width none @@ -28,3 +29,4 @@ wikipedia_locale Str en Wikipedia locale none scan_interval Int 25 Scan interval none download_feeds Boolean True Download podcast feeds to disk none +podcast_show_limit Str 0 Set limit for number of podcast shows in playlist none diff -Nru exaile-0.2.11.1/debian/changelog exaile-0.2.13/debian/changelog --- exaile-0.2.11.1/debian/changelog 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/changelog 2008-05-10 16:32:16.000000000 -0400 @@ -1,3 +1,52 @@ +exaile (0.2.13-0ubuntu1) intrepid; urgency=low + + * New upstream release. + * Removed: debian/docs + * debian/patches + - Dropped 03_fix_mmkeys.dpatch Fixed upstream. + + -- Andrew Starr-Bochicchio Sat, 10 May 2008 16:07:16 -0400 + +exaile (0.2.11.1+debian-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control + + Build-Dep on dpatch needed for patches + + Added a Recommends on gstreamer0.10-plugins-bad, + needed by exaile's equaliser to work. + + Added XS/XB-Python-Version + - debian/patches: + + 02_files-on-share-dir, added to adjust the Makefile to point + to the right policy installation dir on /usr/share/pkg. + + 03_fix_mmkeys.dpatch, added to get Multimedia Keys working + - debian/rules: + + Added a link between /usr/lib/exaile/exaile.py and + /usr/share/exaile/exaile.py preventing an error while starting + exaile up. + + Make burn.py and cd_import.py executables + - Removed: + + debian/README.Debian-source (orig tarball not repackaged) + + debian/pyversions + - debian/docs: Removed README.Debian-source + * debian/patches/02_files-on-share-dir + - Tweaked inorder to apply cleanly. + + -- Andrew Starr-Bochicchio Thu, 01 May 2008 03:23:03 +0100 + +exaile (0.2.11.1+debian-1) unstable; urgency=low + + * New upstream release (Closes: #451549): + - New desktop file (Closes: #444438), + - Cover art can now be disabled (Closes: #444227). + * Drop "432164" patch, fixed upstream. + * Drop 01_fix_makefile_for_pysupport patch, new workaround added. + * Bump Standards-Version to 3.7.3. + * Move homepage to new dpkg standard field. + * Update debian/menu to new policy. + * Drop dpatch bdep, not used anymore. + + -- Adam Cécile (Le_Vert) Mon, 25 Feb 2008 22:52:14 +0100 + exaile (0.2.11.1-0ubuntu3) hardy; urgency=low * debian/patches/03_fix_mmkeys.dpatch, @@ -222,3 +271,4 @@ * Initial release (Closes: #392828). -- François Févotte Sun, 15 Oct 2006 20:48:34 +0200 + diff -Nru exaile-0.2.11.1/debian/control exaile-0.2.13/debian/control --- exaile-0.2.11.1/debian/control 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/control 2008-05-10 16:32:16.000000000 -0400 @@ -5,8 +5,7 @@ XSBC-Original-Maintainer: François Févotte Uploaders: Adam Cécile (Le_Vert) Homepage: http://www.exaile.org/ -Build-Depends: debhelper (>= 5), python-support (>= 0.5), dpatch (>= 2), - libgtk2.0-dev, python-all-dev, python-gtk2-dev, intltool, intltool-debian +Build-Depends: debhelper (>= 5), python-support (>= 0.5), dpatch (>= 2), libgtk2.0-dev, python-all-dev, python-gtk2-dev, intltool, intltool-debian Standards-Version: 3.7.3 XS-Python-Version: current, >= 2.4 diff -Nru exaile-0.2.11.1/debian/docs exaile-0.2.13/debian/docs --- exaile-0.2.11.1/debian/docs 2007-11-07 11:11:38.000000000 -0500 +++ exaile-0.2.13/debian/docs 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -TODO diff -Nru exaile-0.2.11.1/debian/menu exaile-0.2.13/debian/menu --- exaile-0.2.11.1/debian/menu 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/menu 2008-05-10 16:32:16.000000000 -0400 @@ -1,3 +1,3 @@ -?package(exaile):needs="X11" section="Apps/Sound"\ +?package(exaile):needs="X11" section="Applications/Sound" \ title="Exaile" command="/usr/bin/exaile" \ icon="/usr/share/pixmaps/exaile.xpm" diff -Nru exaile-0.2.11.1/debian/patches/00list exaile-0.2.13/debian/patches/00list --- exaile-0.2.11.1/debian/patches/00list 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/patches/00list 2008-05-10 16:32:16.000000000 -0400 @@ -1,3 +1 @@ -01_fix_makefile_for_pysupport 02_files-on-share-dir -03_fix_mmkeys diff -Nru exaile-0.2.11.1/debian/patches/01_fix_makefile_for_pysupport.dpatch exaile-0.2.13/debian/patches/01_fix_makefile_for_pysupport.dpatch --- exaile-0.2.11.1/debian/patches/01_fix_makefile_for_pysupport.dpatch 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/patches/01_fix_makefile_for_pysupport.dpatch 2008-04-01 21:36:32.000000000 -0400 @@ -1,6 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 01_fix_makefile_for_pysupport by Andrea Veri -## Patch updated after the new upstream release. Original patch has been done by +## Patch updated after the new upstream release. Original patch has been done +by ## Adam Cécile (Le_Vert) ## All lines beginning with `## DP:' are a description of the patch. ## DP: Make mmkeys.so python bindings separate from the build to allow @@ -9,19 +10,23 @@ @DPATCH@ diff -urNad exaile-0.2.11~/Makefile exaile-0.2.11/Makefile ---- exaile-0.2.11~/Makefile 2007-10-02 18:25:55.000000000 +0200 -+++ exaile-0.2.11/Makefile 2007-11-07 17:47:54.000000000 +0100 -@@ -1,6 +1,9 @@ +--- exaile_0.2.12/Makefile 2008-03-29 09:29:31.000000000 -0600 ++++ /home/synic/downloads/exaile-0.2.11.1/Makefile 2008-03-29 09:31:22.000000000 -0600 +@@ -1,17 +1,25 @@ PREFIX ?= /usr/local LIBDIR ?= /lib - FIREFOX ?= /usr/lib/firefox ++FIREFOX ?= /usr/lib/firefox +MAKE=$(shell which make) +PYTHON_INC=$(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY')") +PYTHON_VER=$(shell echo $(PYTHON_INC) | sed 's!^.*\([0-9]\.[0-9]\)$$!\1!') all: compile mmkeys.so translations @echo "Done" -@@ -11,7 +14,12 @@ + @echo "Type: 'make install' now" + + compile: +- -bzr version-info --format=python > xl/version.py + python -m compileall xl lib python -O -m compileall xl lib mmkeys.so: @@ -50,7 +55,23 @@ install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images install -m 644 images/default_theme/*.png \ $(DESTDIR)$(PREFIX)/share/exaile/images/default_theme -@@ -81,7 +88,7 @@ +@@ -69,26 +76,25 @@ + /bin/echo -e \ + "#!/bin/sh\n" \ + "cd $(PREFIX)/share/exaile\n" \ ++ "export LD_LIBRARY_PATH=\$$LD_LIBRARY_PATH:$(FIREFOX)\n" \ ++ "export MOZILLA_FIVE_HOME=$(FIREFOX)\n" \ + "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \ + > exaile && \ + chmod 755 exaile + for f in `find po -name exaile.mo` ; do \ +- install -d -m 755 \ +- `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|" | \ +- xargs dirname` && \ +- install -m 644 $$f \ ++ install -D -m 644 $$f \ + `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|"` ; \ + done clean: rm -f mmkeys.so @@ -59,3 +80,10 @@ find . -name "*.py[co]" -exec rm -f {} \; find po -maxdepth 1 -regextype posix-basic -regex "po/[^.]*" -type d -exec rm -rf {} \; rm -f exaile.glade.h messages.pot plugins/plugins.glade.h + + tarball: clean +- tar --exclude .bzr -czvf ../exaile.tar.gz ../exaile ++ tar --exclude .svn -czvf ../exaile.tar.gz ../exaile + + uninstall: + rm -rf $(DESTDIR)$(PREFIX)/share/exaile diff -Nru exaile-0.2.11.1/debian/patches/02_files-on-share-dir.dpatch exaile-0.2.13/debian/patches/02_files-on-share-dir.dpatch --- exaile-0.2.11.1/debian/patches/02_files-on-share-dir.dpatch 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/patches/02_files-on-share-dir.dpatch 2008-05-10 16:32:16.000000000 -0400 @@ -9,7 +9,7 @@ diff -urNad exaile-0.2.11~/Makefile exaile-0.2.11/Makefile --- exaile-0.2.11~/Makefile 2007-11-07 19:02:36.000000000 +0100 +++ exaile-0.2.11/Makefile 2007-11-07 19:04:25.000000000 +0100 -@@ -26,14 +26,11 @@ +@@ -18,14 +18,11 @@ make-install-dirs: mkdir -p $(DESTDIR)$(PREFIX)/bin @@ -29,15 +29,16 @@ mkdir -p $(DESTDIR)$(PREFIX)/share/ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps mkdir -p $(DESTDIR)$(PREFIX)/share/applications -@@ -49,25 +46,25 @@ +@@ -41,7 +38,7 @@ - install: make-install-dirs make-install-mmkeys.so + install: make-install-dirs install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1 - install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile + install -m 644 exaile.py $(DESTDIR)$(PREFIX)/share/exaile install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile install -m 644 sql/*.sql $(DESTDIR)$(PREFIX)/share/exaile/sql +@@ -49,18 +46,18 @@ install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images install -m 644 images/default_theme/*.png \ $(DESTDIR)$(PREFIX)/share/exaile/images/default_theme diff -Nru exaile-0.2.11.1/debian/patches/03_fix_mmkeys.dpatch exaile-0.2.13/debian/patches/03_fix_mmkeys.dpatch --- exaile-0.2.11.1/debian/patches/03_fix_mmkeys.dpatch 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/patches/03_fix_mmkeys.dpatch 1969-12-31 19:00:00.000000000 -0500 @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_fix_mmkeys.dpatch by Pedro Fragoso -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch to fix missing Multimedia Keys - -@DPATCH@ -diff -urNad exaile-0.2.11.1~/xl/xlmisc.py exaile-0.2.11.1/xl/xlmisc.py ---- exaile-0.2.11.1~/xl/xlmisc.py 2007-11-07 16:12:50.000000000 +0000 -+++ exaile-0.2.11.1/xl/xlmisc.py 2008-04-08 03:22:37.000000000 +0100 -@@ -168,9 +168,9 @@ - import dbus - bus = dbus.SessionBus() - obj = bus.get_object('org.gnome.SettingsDaemon', -- '/org/gnome/SettingsDaemon') -+ '/org/gnome/SettingsDaemon/MediaKeys') - self.__gnome = gnome = dbus.Interface(obj, -- 'org.gnome.SettingsDaemon') -+ 'org.gnome.SettingsDaemon.MediaKeys') - gnome.GrabMediaPlayerKeys(self.application, 0) - gnome.connect_to_signal('MediaPlayerKeyPressed', on_gnome_mmkey) - except: diff -Nru exaile-0.2.11.1/debian/rules exaile-0.2.13/debian/rules --- exaile-0.2.11.1/debian/rules 2008-05-10 16:32:16.000000000 -0400 +++ exaile-0.2.13/debian/rules 2008-05-10 16:32:16.000000000 -0400 @@ -23,7 +23,7 @@ clean: unpatch dh_testdir dh_testroot - rm -f build-install-lib-stamp* + rm -f build-install-lib-stamp* po/messages.pot $(MAKE) clean # This should be in upstream Makefile rm -f exaile.glade.h messages.pot plugins/plugins.glade.h @@ -48,7 +48,9 @@ build-install-lib-stamp%: build $(MAKE) clean - $(MAKE) make-install-mmkeys.so DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) PYTHON_INC=/usr/include/python$* + $(MAKE) -C mmkeys mmkeyspy.c + cd mmkeys; python$* setup.py build + cd mmkeys; python$* setup.py install --root=$(DESTDIR) touch $@ binary-indep: build install @@ -61,8 +63,8 @@ dh_installmenu dh_installman # Add mmkeys private python module path - sed -i "s!\(^[^#]*import mmkey.*\)! sys.path.append(\"/usr/lib/exaile/\"+\"python\"+sys.version[:3])\n\1!" \ - $(DESTDIR)/usr/share/exaile/exaile.py + #sed -i "s!\(^[^#]*import mmkey.*\)! sys.path.append(\"/usr/lib/exaile/\"+\"python\"+sys.version[:3])\n\1!" \ + #$(DESTDIR)/usr/share/exaile/exaile.py # Strip useless shebang lines perl debian/strip_shebang $(DESTDIR)/usr/share/exaile/xl/plugins/*.py $(DESTDIR)/usr/share/exaile/exaile.py dh_link $(PREFIX)/share/exaile/exaile.py $(PREFIX)/lib/exaile/exaile.py diff -Nru exaile-0.2.11.1/exaile exaile-0.2.13/exaile --- exaile-0.2.11.1/exaile 2007-11-07 11:11:30.000000000 -0500 +++ exaile-0.2.13/exaile 2008-04-01 21:23:02.000000000 -0400 @@ -10,6 +10,4 @@ fi cd ${PROGRAM_DIR} -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/firefox -export MOZILLA_FIVE_HOME=/usr/lib/firefox exec python -O exaile.py "$@" diff -Nru exaile-0.2.11.1/exaile.desktop exaile-0.2.13/exaile.desktop --- exaile-0.2.11.1/exaile.desktop 2007-11-07 11:11:31.000000000 -0500 +++ exaile-0.2.13/exaile.desktop 2008-04-01 21:23:02.000000000 -0400 @@ -1,9 +1,7 @@ [Desktop Entry] +Type=Application Version=1.0 -Encoding=UTF-8 Name=Exaile Music Player -Name[sr]=Exaile музички програм -Name[sr@latin]=Exaile muzički program Name[de]=Exaile Musik-Wiedergabe Name[fi]=Musiikkisoitin Exaile Name[fr]=Lecteur de musique Exaile @@ -12,8 +10,6 @@ Name[pt_BR]=Reprodutor de Música Exaile Name[sv]=Musikspelaren Exaile GenericName=Music Player -GenericName[sr]=Музички програм -GenericName[sr@latin]=Muzički program GenericName[de]=Musik-Wiedergabe GenericName[fi]=Musiikkisoitin GenericName[en_GB]=Music Player @@ -26,8 +22,6 @@ GenericName[ro]=Program de ascultat muzică GenericName[sv]=Musikspelare Comment=Listen to, explore, or manage your audio collection -Comment[sr]=Слушајте, претражујте и управљајте Вашом музичком збирком -Comment[sr@latin]=Slušajte, pretražujte i upravljajte Vašom muzičkom zbirkom Comment[de]=Audiodateien und -streams wiedergeben, verwalten und Tags bearbeiten Comment[fi]=Kuuntele, selaa, tai hallitse musiikkikokoelmaasi Comment[fr]=Écouter, parcourir et gérer votre musique @@ -38,9 +32,8 @@ Comment[sv]=Spela, utforska och hantera din musiksamling Comment[pt_BR]=Escute, gerencie ou edite sua coleção de músicas Comment[ro]=Ascultați, răsfoiți sau editați-vă colecția de muzică -Exec=exaile +Icon=exaile +Exec=exaile %u Terminal=false -Type=Application -Icon=exaile.png -Categories=AudioVideo;Audio;Player;GTK; MimeType=audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-musepack;application/x-musepack;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audio/mp3;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac; +Categories=AudioVideo;Audio;Player;GTK; diff -Nru exaile-0.2.11.1/exaile.glade exaile-0.2.13/exaile.glade --- exaile-0.2.11.1/exaile.glade 2007-11-07 11:11:32.000000000 -0500 +++ exaile-0.2.13/exaile.glade 2008-04-01 21:23:02.000000000 -0400 @@ -4,8 +4,8 @@ - 800 - 535 + 700 + 400 Exaile GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER @@ -52,7 +52,7 @@ - + True gtk-new 1 @@ -74,13 +74,13 @@ True - _Open Media + _Open Files True - + True gtk-open 1 @@ -101,7 +101,7 @@ - + True gtk-network 1 @@ -122,7 +122,7 @@ - + True gtk-cdrom 1 @@ -143,7 +143,7 @@ - + True gtk-go-down 1 @@ -170,7 +170,7 @@ - + True gtk-save 1 @@ -238,7 +238,7 @@ - + True gtk-home 1 @@ -265,7 +265,7 @@ - + True gtk-execute 1 @@ -309,7 +309,7 @@ - + True gtk-jump-to 1 @@ -459,6 +459,16 @@ + + True + Playcount + True + False + + + + + True @@ -503,7 +513,7 @@ - + True gtk-info 1 @@ -525,7 +535,7 @@ - + True gtk-file 1 @@ -582,7 +592,7 @@ - + True gtk-refresh 1 @@ -607,7 +617,7 @@ True - Randomize Playlist + Randomize Playlist True @@ -716,7 +726,11 @@ True Artist Album -Genre +Genre - Artist +Genre - Album +Year - Artist +Year - Album +Artist - Year - Album False True @@ -1549,7 +1563,7 @@ 3 - + 2 True 0 @@ -3534,8 +3548,7 @@ True - Start with + Start with False False GTK_JUSTIFY_LEFT @@ -3592,8 +3605,7 @@ True - out of: + out of: False False GTK_JUSTIFY_LEFT @@ -3757,28 +3769,160 @@ + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER_ON_PARENT False - False - False + True + True True False False - GDK_WINDOW_TYPE_HINT_DIALOG + GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True False + + - + True False 0 - + + True + GTK_ORIENTATION_HORIZONTAL + GTK_TOOLBAR_BOTH + True + True + + + + True + gtk-zoom-in + True + True + False + + + + False + True + + + + + + True + gtk-zoom-out + True + True + False + + + + False + True + + + + + + True + gtk-zoom-100 + True + True + False + + + + False + True + + + + + + True + gtk-zoom-fit + True + True + False + + + + False + True + + + + + 0 + False + False + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 400 + 400 + 0 0 400 10 0 0 + 0 0 400 10 0 0 + + + + 0 + 0 + True + gtk-missing-image + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + 0 + + + + + + + 0 + True + True + + + + + + True + True + + + 0 + False + True + @@ -4502,6 +4646,25 @@ + + True + True + Automatically check for Exaile and plugin updates + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + True False @@ -5044,6 +5207,64 @@ + + True + False + 1 + + + + True + Opacity Level: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_IF_VALID + False + False + 75 0 100 1 10 10 + + + 0 + False + False + GTK_PACK_END + + + + + 0 + True + True + + + + True False @@ -5846,62 +6067,34 @@ - + True - 2 - 2 False - 3 - 3 - - - - True - True - True - False - 0 - - True - ● - False - - - 1 - 2 - 1 - 2 - - - - + 3 - + True True - True - True - 0 - - True - ● - False + Submit to Last.fm + True + GTK_RELIEF_NORMAL + True + False + False + True - 1 - 2 - 0 - 1 - - + 0 + False + False - + True - Last.fm Username: + (Note: Toggle this during playback via Ctrl+Shift+L) False False GTK_JUSTIFY_LEFT @@ -5917,55 +6110,140 @@ 0 - 0 - 1 - 0 - 1 - - + 0 + False + False - + True - Last.fm Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - - False - True - - + 2 + 2 + False + 3 + 3 - - - True - Last.fm - False - False + + + True + True + True + False + 0 + + True + ● + False + + + 1 + 2 + 1 + 2 + + + + + + + + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 0 + 1 + + + + + + + + True + Last.fm Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Last.fm Username: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + 0 + True + True + + + + + False + True + + + + + + True + Last.fm + False + False GTK_JUSTIFY_LEFT False False @@ -6015,31 +6293,133 @@ 0 - + True - True - Download feeds when opening podcasts - True - GTK_RELIEF_NORMAL - True - False - False - True + 3 + 2 + False + 0 + 0 + + + + True + Download Location: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + False + 0 + + + + True + Select A File + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + True + True + False + -1 + + + 0 + True + True + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + False + + + + + 1 + 2 + 0 + 1 + fill + + 0 - False - False + True + True - - - - - - - - @@ -6342,11 +6722,13 @@ True - Automatic + Automatic Use GConf Settings +pulsesink +esdsink +jackaudiosink alsasink -osssink -esdsink +osssink False True @@ -6880,6 +7262,280 @@ tab + + + + True + False + 0 + + + + True + True + Connect Using A Proxy Server + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + 3 + True + 4 + 2 + False + 0 + 5 + + + + True + Server Address: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + 0 + + True + ● + False + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + 0 + + True + ● + False + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + Username: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Server Port: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + 0 + + True + ● + False + + + 1 + 2 + 0 + 1 + fill + + + + + + 0 + True + True + + + + + False + True + + + + + + True + Proxy Settings + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + @@ -6925,24 +7581,27 @@ + 5 True + Exaile (c) 2007 Exaile - Copyright (C) 2006 Adam Olsen + Copyright (C) 2007 Adam Olsen <arolsen@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) -any later version. +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + False http://www.exaile.org Adam Olsen @@ -7575,22 +8234,16 @@ 12 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True + Enable Equalizer + True + GTK_RELIEF_NORMAL + True + False + False + True 0 @@ -8968,4 +9621,75 @@ + + False + ThemeInfo + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 0 + + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + 0.2.12 +0.2.12b +0.2.12devel + + + + + 0 + True + True + + + + + + + + + + + + + + diff -Nru exaile-0.2.11.1/exaile.py exaile-0.2.13/exaile.py --- exaile-0.2.11.1/exaile.py 2007-11-07 11:11:33.000000000 -0500 +++ exaile-0.2.13/exaile.py 2008-04-01 21:23:02.000000000 -0400 @@ -16,7 +16,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -__version__ = '0.2.11' +__version__ = '0.2.13' + import sys if sys.platform == 'linux2': @@ -38,16 +39,15 @@ EXAILE_OPTIONS = xl.dbusinterface.get_options() DBUS_EXIT = xl.dbusinterface.test(EXAILE_OPTIONS) -# find out if they are asking for help +# find out if they are asking for help or version HELP = False -for val in sys.argv: - if val == '-h' or val == '--help': HELP = True - -if '-h' in sys.argv: sys.argv.remove('-h') -if '--help' in sys.argv: sys.argv.remove('--help') -if '--version' in sys.argv: - print "Exaile version: %s" % __version__ - sys.exit(0) +for val in sys.argv[:]: + if val in ('-h', '--help'): + HELP = True + sys.argv.remove(val) + elif val == '--version': + print "Exaile version:", __version__ + sys.exit(0) import os.path @@ -59,8 +59,9 @@ # Find out the location of exaile's working directory, and insert it to sys.path basedir = os.path.dirname(os.path.realpath(__file__)) if not os.path.exists(os.path.join(basedir, "exaile.py")): - if os.path.exists(os.path.join(os.getcwd(), "exaile.py")): - basedir = os.getcwd() + cwd = os.getcwd() + if os.path.exists(os.path.join(cwd, "exaile.py")): + basedir = cwd sys.path.insert(0, basedir) # Evil heuristic to check whether Exaile is installed, by looking for Makefile. @@ -69,11 +70,9 @@ import xl.path options, args = EXAILE_OPTIONS.parse_args() -if not options.settings: - xl.path.init(basedir, installed) -else: +if options.settings: xl.path.set_configdir(options.settings) - xl.path.init(basedir, installed) +xl.path.init(basedir, installed) # set up gettext for translations @@ -104,11 +103,7 @@ if not os.path.isdir(covers): os.mkdir(covers) -def main(): - """ - Everything dispatches from this main function - """ - +def init(): if HELP: EXAILE_OPTIONS.print_help() sys.exit(0) @@ -118,33 +113,30 @@ track.find_and_delete_dups(options.dups) sys.exit(0) + if DBUS_EXIT: + sys.exit(0) + running_checks = ('next', 'prev', 'stop', 'play', 'guiquery', 'get_title', 'get_artist', 'get_album', 'get_length', 'current_position', - 'inc_vol', 'dec_vol', 'query') - + 'inc_vol', 'dec_vol', 'get_volume', 'query') # check passed arguments for options that require exaile to currently be # running - if not DBUS_EXIT: - for check in running_checks: - if getattr(options, check): - print "No running Exaile instance found." - sys.exit(1) - - check_dirs() - - exaile = exailemain.ExaileWindow(options, xl.path.firstrun) - else: - sys.exit(0) + for check in running_checks: + if getattr(options, check): + print "No running Exaile instance found." + sys.exit(1) + + check_dirs() - gtk.main() + xlmisc.log("Exaile " + __version__) + exaile = exailemain.ExaileWindow(options, xl.path.firstrun) if __name__ == "__main__": try: - main() + init() + gtk.main() except SystemExit: raise - except: # BaseException doesn't exist in python2.4 - import traceback - traceback.print_exc() + except Exception: xlmisc.log_exception() Binary files /tmp/O7NYOua9Re/exaile-0.2.11.1/images/trayicon.png and /tmp/GdFXg7wesG/exaile-0.2.13/images/trayicon.png differ Binary files /tmp/O7NYOua9Re/exaile-0.2.11.1/images/year.png and /tmp/GdFXg7wesG/exaile-0.2.13/images/year.png differ diff -Nru exaile-0.2.11.1/INSTALL exaile-0.2.13/INSTALL --- exaile-0.2.11.1/INSTALL 1969-12-31 19:00:00.000000000 -0500 +++ exaile-0.2.13/INSTALL 2008-04-01 21:23:02.000000000 -0400 @@ -0,0 +1,21 @@ +To install: + + % make + % make install + +The "make" step is optional and only compiles the modules, translations, and the +mmkeys extension. + +Environment variables that affect "make install": + + FIREFOX + Where Mozilla is installed. Default: /usr/lib/firefox + LIBDIR + The lib directory to be appended to PREFIX. Default: /lib + PREFIX + The installation prefix. Default: /usr/local + +For example, if Mozilla is installed in /usr/lib/xulrunner, you can run +"make install" as: + + % FIREFOX=/usr/lib/xulrunner make install diff -Nru exaile-0.2.11.1/lib/ecs.py exaile-0.2.13/lib/ecs.py --- exaile-0.2.11.1/lib/ecs.py 1969-12-31 19:00:00.000000000 -0500 +++ exaile-0.2.13/lib/ecs.py 2008-04-01 21:50:04.000000000 -0400 @@ -0,0 +1,706 @@ +"""Python wrapper for AWS E-Commerce Serive APIs. + +Based upon pyamazon (http://www.josephson.org/projects/pyamazon/) with +efforts to meet the latest AWS specification. + +The Amazon's web APIs specication is described here: +http://www.amazon.com/webservices + +You need a Amazon-provided license key to use these services. +Follow the link above to get one. These functions will look in +several places (in this order) for the license key: + - the "license_key" argument of each function + - the module-level LICENSE_KEY variable (call setLicense once to set it) + - an environment variable called AMAZON_LICENSE_KEY + - foo would return the python object, XMLfoo returns the DOM object + +License: Python Software Foundation License +""" + + +import os, urllib, string, inspect +from xml.dom import minidom + +__author__ = "Kun Xi < kunxi@kunxi.org >" +__version__ = "0.2.0" +__license__ = "Python Software Foundation" + + +"""Package-wide variables: +""" +LICENSE_KEY = None; +HTTP_PROXY = None +LOCALE = "us" +VERSION = "2007-02-22" + +__supportedLocales = { + None : "webservices.amazon.com", + "us" : "webservices.amazon.com", + "uk" : "webservices.amazon.co.uk", + "de" : "webservices.amazon.de", + "jp" : "webservices.amazon.co.jp", + "fr" : "webservices.amazon.fr", + "ca" : "webservices.amazon.ca" + } + +__licenseKeys = ( + (lambda key: key), + (lambda key: LICENSE_KEY), + (lambda key: os.environ.get('AWS_LICENSE_KEY', None)) + ) + + +class AWSException(Exception) : + '''Base class for all AWS exceptions''' + pass + +class NoLicenseKey(AWSException) : pass +class BadLocale(AWSException) : pass +# Runtime exception +class ExactParameterRequirement(AWSException): pass +class ExceededMaximumParameterValues(AWSException): pass +class InsufficientParameterValues(AWSException): pass +class InternalError(AWSException): pass +class InvalidEnumeratedParameter(AWSException): pass +class InvalidISO8601Time(AWSException): pass +class InvalidOperationForMarketplace(AWSException): pass +class InvalidOperationParameter(AWSException): pass +class InvalidParameterCombination(AWSException): pass +class InvalidParameterValue(AWSException): pass +class InvalidResponseGroup(AWSException): pass +class InvalidServiceParameter(AWSException): pass +class InvalidSubscriptionId(AWSException): pass +class InvalidXSLTAddress(AWSException): pass +class MaximumParameterRequirement(AWSException): pass +class MinimumParameterRequirement(AWSException): pass +class MissingOperationParameter(AWSException): pass +class MissingParameterCombination(AWSException): pass +class MissingParameters(AWSException): pass +class MissingParameterValueCombination(AWSException): pass +class MissingServiceParameter(AWSException): pass +class ParameterOutOfRange(AWSException): pass +class ParameterRepeatedInRequest(AWSException): pass +class RestrictedParameterValueCombination(AWSException): pass +class XSLTTransformationError(AWSException): pass + +class Bag : + '''Wrapper class for DOM nodes''' + pass + + + +# Utilities functions + +def setLocale(locale): + """set locale + + if unsupported locale is set, BadLocale is raised.""" + global LOCALE + if not __supportedLocales.has_key(locale): + raise BadLocale, ("Unsupported locale. Locale must be one of: %s" % + ', '.join([x for x in __supportedLocales.keys() if x])) + LOCALE = locale + + +def getLocale(): + """get locale""" + return LOCALE + + +def setLicenseKey(license_key=None): + """set license key + + license key can come from any number of locations; + see module docs for search order. + if no license key is specified, BadLocale is raised.""" + + global LICENSE_KEY + for get in __licenseKeys: + rc = get(license_key) + if rc: + LICENSE_KEY = rc; + return; + raise NoLicenseKey, ("Please get the license key from http://www.amazon.com/webservices") + + +def getLicenseKey(): + """get license key + + if no license key is specified, BadLocale is raised.""" + + if not LICENSE_KEY: + raise NoLicenseKey, ("Please get the license key from http://www.amazon.com/webservices") + return LICENSE_KEY + + +def getVersion(): + """get version""" + return VERSION + + +def buildRequest(argv): + """Build the REST request URL from argv, + + all key, value pairs in argv are quoted.""" + + url = "http://" + __supportedLocales[getLocale()] + "/onca/xml?Service=AWSECommerceService&" + url = url + '&'.join(['%s=%s' % (k,urllib.quote(str(v))) for (k,v) in argv.items() if v]) + return url + + +def buildException(els): + """Build the exception from the returned DOM node + + Only the first exception is raised.""" + + error = els[0] + class_name = error.childNodes[0].firstChild.data[4:] + msg = error.childNodes[1].firstChild.data + + e = globals()[ class_name ](msg) + return e + + +def query(url): + """Send the query url and return the DOM + + Exception is raised if there is errors""" + u = urllib.FancyURLopener(HTTP_PROXY) + usock = u.open(url) + dom = minidom.parse(usock) + usock.close() + + errors = dom.getElementsByTagName('Error') + if errors: + e = buildException(errors) + raise e + return dom + + +def rawObject(XMLSearch, arguments, kwItem, plugins=None): + '''Return a unique object''' + + dom = XMLSearch(** arguments) + return unmarshal(dom.getElementsByTagName(kwItem).item(0), plugins) + + +def rawIterator(XMLSearch, arguments, kwItems, plugins=None): + '''Return list of objects''' + + dom = XMLSearch(** arguments) + items = unmarshal(dom.getElementsByTagName(kwItems).item(0), plugins, wrappedIterator()) + return items + +class wrappedIterator(list): + '''Return inherited list object, + + we may add more attributes later''' + + pass + + +class pagedIterator: + '''Return a page-based iterator''' + + def __init__(self, XMLSearch, arguments, kwPage, kwItems, plugins=None): + """XMLSearch: the callback function that returns the DOM + arguments: the arguments for XMLSearch + kwPage, kwItems: Tag name of Page, Items to organize the object + plugins: please check unmarshal + """ + self.__search = XMLSearch + self.__arguments = arguments + self.__keywords ={'Page':kwPage, 'Items':kwItems} + self.__plugins = plugins + self.__page = arguments[kwPage] or 1 + self.__index = 0 + dom = self.__search(** self.__arguments) + self.__items = unmarshal(dom.getElementsByTagName(kwItems).item(0), plugins, wrappedIterator()) + try: + self.__len = int(dom.getElementsByTagName("TotalResults").item(0).firstChild.data) + except AttributeError, e: + self.__len = len(self.__items) + + def __len__(self): + return self.__len + + def __iter__(self): + return self + + def next(self): + if self.__index < self.__len: + self.__index = self.__index + 1 + return self.__getitem__(self.__index-1) + else: + raise StopIteration + + def __getitem__(self, key): + try: + num = int(key) + except TypeError, e: + raise e + + if num >= self.__len: + raise IndexError + + page = num / 10 + 1 + index = num % 10 + if page != self.__page: + self.__arguments[self.__keywords['Page']] = page + dom = self.__search(** self.__arguments) + self.__items = unmarshal(dom.getElementsByTagName(self.__keywords['Items']).item(0), self.__plugins, wrappedIterator()) + self.__page = page + + return self.__items[index] + + +def unmarshal(element, plugins=None, rc=None): + """Return the Bag object with attributes populated using DOM element + + element: the root of the DOM element we are interested in + plugins: callback functions to fine-tune the object structure + rc: parent object, used in the recursive call + + This core function is inspired by Mark Pilgrim (f8dy@diveintomark.org) + with some enhancement. Each node.tagName is evalued by plugins' callback + functions: + + if plugins['isBypassed'] is true: + this elment is ignored + if plugins['isPivoted'] is true: + this children of this elment is moved to grandparents + this object is ignored. + if plugins['isCollective'] is true: + this elment is mapped to [] + if plugins['isCollected'] is true: + this children of elment is appended to grandparent + this object is ignored. + """ + + if(rc == None): + rc = Bag() + + if(plugins == None): + plugins = {} + + childElements = [e for e in element.childNodes if isinstance(e, minidom.Element)] + + if childElements: + for child in childElements: + key = child.tagName + if hasattr(rc, key): + if type(getattr(rc, key)) <> type([]): + setattr(rc, key, [getattr(rc, key)]) + setattr(rc, key, getattr(rc, key) + [unmarshal(child, plugins)]) + elif isinstance(child, minidom.Element): + if plugins.has_key('isPivoted') and plugins['isPivoted'](child.tagName): + unmarshal(child, plugins, rc) + elif plugins.has_key('isBypassed') and plugins['isBypassed'](child.tagName): + continue + elif plugins.has_key('isCollective') and plugins['isCollective'](child.tagName): + setattr(rc, key, unmarshal(child, plugins, wrappedIterator([]))) + elif plugins.has_key('isCollected') and plugins['isCollected'](child.tagName): + rc.append(unmarshal(child, plugins)) + else: + setattr(rc, key, unmarshal(child, plugins)) + else: + rc = "".join([e.data for e in element.childNodes if isinstance(e, minidom.Text)]) + return rc + + + +# User interfaces + +def ItemLookup(ItemId, IdType=None, SearchIndex=None, MerchantId=None, Condition=None, DeliveryMethod=None, ISPUPostalCode=None, OfferPage=None, ReviewPage=None, VariationPage=None, ResponseGroup=None, AWSAccessKeyId=None): + '''ItemLookup in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isPivoted': lambda x: x == 'ItemAttributes', + 'isCollective': lambda x: x == 'Items', + 'isCollected': lambda x: x == 'Item'} + return pagedIterator(XMLItemLookup, argv, 'OfferPage', 'Items', plugins) + + +def XMLItemLookup(ItemId, IdType=None, SearchIndex=None, MerchantId=None, Condition=None, DeliveryMethod=None, ISPUPostalCode=None, OfferPage=None, ReviewPage=None, VariationPage=None, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of ItemLookup in ECS''' + + Operation = "ItemLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +def ItemSearch(Keywords, SearchIndex="Blended", Availability=None, Title=None, Power=None, BrowseNode=None, Artist=None, Author=None, Actor=None, Director=None, AudienceRating=None, Manufacturer=None, MusicLabel=None, Composer=None, Publisher=None, Brand=None, Conductor=None, Orchestra=None, TextStream=None, ItemPage=None, Sort=None, City=None, Cuisine=None, Neighborhood=None, MinimumPrice=None, MaximumPrice=None, MerchantId=None, Condition=None, DeliveryMethod=None, ResponseGroup=None, AWSAccessKeyId=None): + '''ItemSearch in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isPivoted': lambda x: x == 'ItemAttributes', + 'isCollective': lambda x: x == 'Items', + 'isCollected': lambda x: x == 'Item'} + return pagedIterator(XMLItemSearch, argv, "ItemPage", 'Items', plugins) + + +def XMLItemSearch(Keywords, SearchIndex="Blended", Availability=None, Title=None, Power=None, BrowseNode=None, Artist=None, Author=None, Actor=None, Director=None, AudienceRating=None, Manufacturer=None, MusicLabel=None, Composer=None, Publisher=None, Brand=None, Conductor=None, Orchestra=None, TextStream=None, ItemPage=None, Sort=None, City=None, Cuisine=None, Neighborhood=None, MinimumPrice=None, MaximumPrice=None, MerchantId=None, Condition=None, DeliveryMethod=None, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of ItemSearch in ECS''' + + Operation = "ItemSearch" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +def SimilarityLookup(ItemId, SimilarityType=None, MerchantId=None, Condition=None, DeliveryMethod=None, ResponseGroup=None, AWSAccessKeyId=None): + '''SimilarityLookup in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isPivoted': lambda x: x == 'ItemAttributes', + 'isCollective': lambda x: x == 'Items', + 'isCollected': lambda x: x == 'Item'} + return rawIterator(XMLSimilarityLookup, argv, 'Items', plugins) + + +def XMLSimilarityLookup(ItemId, SimilarityType=None, MerchantId=None, Condition=None, DeliveryMethod=None, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of SimilarityLookup in ECS''' + + Operation = "SimilarityLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +# List Operations + +def ListLookup(ListType, ListId, ProductPage=None, ProductGroup=None, Sort=None, MerchantId=None, Condition=None, DeliveryMethod=None, ResponseGroup=None, AWSAccessKeyId=None): + '''ListLookup in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isPivoted': lambda x: x == 'ItemAttributes', + 'isCollective': lambda x: x == 'Lists', + 'isCollected': lambda x: x == 'List'} + return pagedIterator(XMLListLookup, argv, 'ProductPage', 'Lists', plugins) + + +def XMLListLookup(ListType, ListId, ProductPage=None, ProductGroup=None, Sort=None, MerchantId=None, Condition=None, DeliveryMethod=None, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of ListLookup in ECS''' + + Operation = "ListLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +def ListSearch(ListType, Name=None, FirstName=None, LastName=None, Email=None, City=None, State=None, ListPage=None, ResponseGroup=None, AWSAccessKeyId=None): + '''ListSearch in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isPivoted': lambda x: x == 'ItemAttributes', + 'isCollective': lambda x: x == 'Lists', + 'isCollected': lambda x: x == 'List'} + return pagedIterator(XMLListSearch, argv, 'ListPage', 'Lists', plugins) + + +def XMLListSearch(ListType, Name=None, FirstName=None, LastName=None, Email=None, City=None, State=None, ListPage=None, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of ListSearch in ECS''' + + Operation = "ListSearch" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +#Remote Shopping Cart Operations +def CartCreate(Items, Quantities, ResponseGroup=None, AWSAccessKeyId=None): + '''CartCreate in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + return __cartOperation(XMLCartCreate, argv) + + +def XMLCartCreate(Items, Quantities, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of CartCreate in ECS''' + + Operation = "CartCreate" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + for x in ('Items', 'Quantities'): + del argv[x] + + __fromListToItems(argv, Items, 'ASIN', Quantities) + return query(buildRequest(argv)) + + +def CartAdd(Cart, Items, Quantities, ResponseGroup=None, AWSAccessKeyId=None): + '''CartAdd in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + return __cartOperation(XMLCartAdd, argv) + + +def XMLCartAdd(Cart, Items, Quantities, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of CartAdd in ECS''' + + Operation = "CartAdd" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + CartId = Cart.CartId + HMAC = Cart.HMAC + argv = inspect.getargvalues(inspect.currentframe())[-1] + for x in ('Items', 'Cart', 'Quantities'): + del argv[x] + + __fromListToItems(argv, Items, 'ASIN', Quantities) + return query(buildRequest(argv)) + + +def CartGet(Cart, ResponseGroup=None, AWSAccessKeyId=None): + '''CartGet in ECS''' + argv = inspect.getargvalues(inspect.currentframe())[-1] + return __cartOperation(XMLCartGet, argv) + + +def XMLCartGet(Cart, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of CartGet in ECS''' + + Operation = "CartGet" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + CartId = Cart.CartId + HMAC = Cart.HMAC + argv = inspect.getargvalues(inspect.currentframe())[-1] + del argv['Cart'] + return query(buildRequest(argv)) + + +def CartModify(Cart, Items, Actions, ResponseGroup=None, AWSAccessKeyId=None): + '''CartModify in ECS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + return __cartOperation(XMLCartModify, argv) + + +def XMLCartModify(Cart, Items, Actions, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of CartModify in ECS''' + Operation = "CartModify" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + CartId = Cart.CartId + HMAC = Cart.HMAC + argv = inspect.getargvalues(inspect.currentframe())[-1] + for x in ('Cart', 'Items', 'Actions'): + del argv[x] + + __fromListToItems(argv, Items, 'CartItemId', Actions) + return query(buildRequest(argv)) + + +def CartClear(Cart, ResponseGroup=None, AWSAccessKeyId=None): + '''CartClear in ECS''' + argv = inspect.getargvalues(inspect.currentframe())[-1] + return __cartOperation(XMLCartClear, argv) + + +def XMLCartClear(Cart, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of CartClear in ECS''' + + Operation = "CartClear" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + CartId = Cart.CartId + HMAC = Cart.HMAC + argv = inspect.getargvalues(inspect.currentframe())[-1] + del argv['Cart'] + + return query(buildRequest(argv)) + + +def __fromListToItems(argv, items, id, actions): + '''Convert list to AWS REST arguments''' + + for i in range(len(items)): + argv["Item.%d.%s" % (i+1, id)] = getattr(items[i], id); + action = actions[i] + if isinstance(action, int): + argv["Item.%d.Quantity" % (i+1)] = action + else: + argv["Item.%d.Action" % (i+1)] = action + + +def __cartOperation(XMLSearch, arguments): + '''Generic cart operation''' + + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x in ('CartItems', 'SavedForLaterItems'), + 'isCollected': lambda x: x in ('CartItem', 'SavedForLaterItem') } + return rawObject(XMLSearch, arguments, 'Cart', plugins) + + +# Seller Operation +def SellerLookup(Sellers, ResponseGroup=None, AWSAccessKeyId=None): + '''SellerLookup in AWS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x == 'Sellers', + 'isCollected': lambda x: x == 'Seller'} + return rawIterator(XMLSellerLookup, argv, 'Sellers', plugins) + + +def XMLSellerLookup(Sellers, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of SellerLookup in AWS''' + + Operation = "SellerLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + SellerId = ",".join(Sellers) + argv = inspect.getargvalues(inspect.currentframe())[-1] + del argv['Sellers'] + return query(buildRequest(argv)) + + +def SellerListingLookup(SellerId, Id, IdType="Listing", ResponseGroup=None, AWSAccessKeyId=None): + '''SellerListingLookup in AWS + + Notice: although the repsonse includes TotalPage, TotalResults, + there is no ListingPage in the request, so we have to use rawIterator + instead of pagedIterator. Hope Amazaon would fix this inconsistance''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x == 'SellerListings', + 'isCollected': lambda x: x == 'SellerListing'} + return rawIterator(XMLSellerListingLookup, argv, "SellerListings", plugins) + + +def XMLSellerListingLookup(SellerId, Id, IdType="Listing", ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of SellerListingLookup in AWS''' + + Operation = "SellerListingLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +def SellerListingSearch(SellerId, Title=None, Sort=None, ListingPage=None, OfferStatus=None, ResponseGroup=None, AWSAccessKeyId=None): + '''SellerListingSearch in AWS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x == 'SellerListings', + 'isCollected': lambda x: x == 'SellerListing'} + return pagedIterator(XMLSellerListingSearch, argv, "ListingPage", "SellerListings", plugins) + + +def XMLSellerListingSearch(SellerId, Title=None, Sort=None, ListingPage=None, OfferStatus=None, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of SellerListingSearch in AWS''' + + Operation = "SellerListingSearch" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +def CustomerContentSearch(Name=None, Email=None, CustomerPage=1, ResponseGroup=None, AWSAccessKeyId=None): + '''CustomerContentSearch in AWS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x in ('Customers', 'CustomerReviews'), + 'isCollected': lambda x: x in ('Customer', 'Review')} + return rawIterator(XMLCustomerContentSearch, argv, 'Customers', plugins) + + +def XMLCustomerContentSearch(Name=None, Email=None, CustomerPage=1, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of CustomerContentSearch in AWS''' + + Operation = "CustomerContentSearch" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + for x in ('Name', 'Email'): + if not argv[x]: + del argv[x] + return query(buildRequest(argv)) + + +def CustomerContentLookup(CustomerId, ReviewPage=1, ResponseGroup=None, AWSAccessKeyId=None): + '''CustomerContentLookup in AWS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x == 'Customers', + 'isCollected': lambda x: x == 'Customer'} + return rawIterator(XMLCustomerContentLookup, argv, 'Customers', plugins) + + +def XMLCustomerContentLookup(CustomerId, ReviewPage=1, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of CustomerContentLookup in AWS''' + + Operation = "CustomerContentLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +# BrowseNode +def BrowseNodeLookup(BrowseNodeId, ResponseGroup=None, AWSAccessKeyId=None): + '''BrowseNodeLookup in AWS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x == 'Children', + 'isCollected': lambda x: x == 'BrowseNode'} + return rawIterator(XMLBrowseNodeLookup, argv, 'BrowseNodes', plugins) + + +def XMLBrowseNodeLookup(BrowseNodeId, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of BrowseNodeLookup in AWS''' + + Operation = "BrowseNodeLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +# Help +def Help(HelpType, About, ResponseGroup=None, AWSAccessKeyId=None): + '''Help in AWS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x in ('RequiredParameters', + 'AvailableParameters', 'DefaultResponseGroups', + 'AvailableResponseGroups'), + 'isCollected': lambda x: x in ('Parameter', 'ResponseGroup') } + return rawObject(XMLHelp, argv, 'Information', plugins) + + +def XMLHelp(HelpType, About, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of Help in AWS''' + + Operation = "Help" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + +# Transaction +def TransactionLookup(TransactionId, ResponseGroup=None, AWSAccessKeyId=None): + '''TransactionLookup in AWS''' + + argv = inspect.getargvalues(inspect.currentframe())[-1] + plugins = {'isBypassed': lambda x: x == 'Request', + 'isCollective': lambda x: x in ('Transactions', 'TransactionItems', 'Shipments'), + 'isCollected': lambda x: x in ('Transaction', 'TransactionItem', 'Shipment')} + + return rawIterator(XMLTransactionLookup, argv, 'Transactions', plugins) + + +def XMLTransactionLookup(TransactionId, ResponseGroup=None, AWSAccessKeyId=None): + '''DOM representation of TransactionLookup in AWS''' + + Operation = "TransactionLookup" + AWSAccessKeyId = AWSAccessKeyId or LICENSE_KEY + argv = inspect.getargvalues(inspect.currentframe())[-1] + return query(buildRequest(argv)) + + + +if __name__ == "__main__" : + setLicenseKey("YOUR-LICENSE-HERE"); + sll = SellerListingLookup("A3ENSIQ3ZA4FFN", "1106K206331") + print dir(sll[0]) + diff -Nru exaile-0.2.11.1/lib/feedparser.py exaile-0.2.13/lib/feedparser.py --- exaile-0.2.11.1/lib/feedparser.py 1969-12-31 19:00:00.000000000 -0500 +++ exaile-0.2.13/lib/feedparser.py 2008-04-01 21:23:02.000000000 -0400 @@ -0,0 +1,2858 @@ +#!/usr/bin/env python +"""Universal feed parser + +Handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds + +Visit http://feedparser.org/ for the latest version +Visit http://feedparser.org/docs/ for the latest documentation + +Required: Python 2.1 or later +Recommended: Python 2.3 or later +Recommended: CJKCodecs and iconv_codec +""" + +__version__ = "4.1"# + "$Revision: 1.92 $"[11:15] + "-cvs" +__license__ = """Copyright (c) 2002-2006, Mark Pilgrim, All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.""" +__author__ = "Mark Pilgrim " +__contributors__ = ["Jason Diamond ", + "John Beimler ", + "Fazal Majid ", + "Aaron Swartz ", + "Kevin Marks "] +_debug = 0 + +# HTTP "User-Agent" header to send to servers when downloading feeds. +# If you are embedding feedparser in a larger application, you should +# change this to your application name and URL. +USER_AGENT = "UniversalFeedParser/%s +http://feedparser.org/" % __version__ + +# HTTP "Accept" header to send to servers when downloading feeds. If you don't +# want to send an Accept header, set this to None. +ACCEPT_HEADER = "application/atom+xml,application/rdf+xml,application/rss+xml,application/x-netcdf,application/xml;q=0.9,text/xml;q=0.2,*/*;q=0.1" + +# List of preferred XML parsers, by SAX driver name. These will be tried first, +# but if they're not installed, Python will keep searching through its own list +# of pre-installed parsers until it finds one that supports everything we need. +PREFERRED_XML_PARSERS = ["drv_libxml2"] + +# If you want feedparser to automatically run HTML markup through HTML Tidy, set +# this to 1. Requires mxTidy +# or utidylib . +TIDY_MARKUP = 0 + +# List of Python interfaces for HTML Tidy, in order of preference. Only useful +# if TIDY_MARKUP = 1 +PREFERRED_TIDY_INTERFACES = ["uTidy", "mxTidy"] + +# ---------- required modules (should come with any Python distribution) ---------- +import sgmllib, re, sys, copy, urlparse, time, rfc822, types, cgi, urllib, urllib2 +try: + from cStringIO import StringIO as _StringIO +except: + from StringIO import StringIO as _StringIO + +# ---------- optional modules (feedparser will work without these, but with reduced functionality) ---------- + +# gzip is included with most Python distributions, but may not be available if you compiled your own +try: + import gzip +except: + gzip = None +try: + import zlib +except: + zlib = None + +# If a real XML parser is available, feedparser will attempt to use it. feedparser has +# been tested with the built-in SAX parser, PyXML, and libxml2. On platforms where the +# Python distribution does not come with an XML parser (such as Mac OS X 10.2 and some +# versions of FreeBSD), feedparser will quietly fall back on regex-based parsing. +try: + import xml.sax + xml.sax.make_parser(PREFERRED_XML_PARSERS) # test for valid parsers + from xml.sax.saxutils import escape as _xmlescape + _XML_AVAILABLE = 1 +except: + _XML_AVAILABLE = 0 + def _xmlescape(data): + data = data.replace('&', '&') + data = data.replace('>', '>') + data = data.replace('<', '<') + return data + +# base64 support for Atom feeds that contain embedded binary data +try: + import base64, binascii +except: + base64 = binascii = None + +# cjkcodecs and iconv_codec provide support for more character encodings. +# Both are available from http://cjkpython.i18n.org/ +try: + import cjkcodecs.aliases +except: + pass +try: + import iconv_codec +except: + pass + +# chardet library auto-detects character encodings +# Download from http://chardet.feedparser.org/ +try: + import chardet + if _debug: + import chardet.constants + chardet.constants._debug = 1 +except: + chardet = None + +# ---------- don't touch these ---------- +class ThingsNobodyCaresAboutButMe(Exception): pass +class CharacterEncodingOverride(ThingsNobodyCaresAboutButMe): pass +class CharacterEncodingUnknown(ThingsNobodyCaresAboutButMe): pass +class NonXMLContentType(ThingsNobodyCaresAboutButMe): pass +class UndeclaredNamespace(Exception): pass + +sgmllib.tagfind = re.compile('[a-zA-Z][-_.:a-zA-Z0-9]*') +sgmllib.special = re.compile('' % (tag, ''.join([' %s="%s"' % t for t in attrs])), escape=0) + + # match namespaces + if tag.find(':') <> -1: + prefix, suffix = tag.split(':', 1) + else: + prefix, suffix = '', tag + prefix = self.namespacemap.get(prefix, prefix) + if prefix: + prefix = prefix + '_' + + # special hack for better tracking of empty textinput/image elements in illformed feeds + if (not prefix) and tag not in ('title', 'link', 'description', 'name'): + self.intextinput = 0 + if (not prefix) and tag not in ('title', 'link', 'description', 'url', 'href', 'width', 'height'): + self.inimage = 0 + + # call special handler (if defined) or default handler + methodname = '_start_' + prefix + suffix + try: + method = getattr(self, methodname) + return method(attrsD) + except AttributeError: + return self.push(prefix + suffix, 1) + + def unknown_endtag(self, tag): + if _debug: sys.stderr.write('end %s\n' % tag) + # match namespaces + if tag.find(':') <> -1: + prefix, suffix = tag.split(':', 1) + else: + prefix, suffix = '', tag + prefix = self.namespacemap.get(prefix, prefix) + if prefix: + prefix = prefix + '_' + + # call special handler (if defined) or default handler + methodname = '_end_' + prefix + suffix + try: + method = getattr(self, methodname) + method() + except AttributeError: + self.pop(prefix + suffix) + + # track inline content + if self.incontent and self.contentparams.has_key('type') and not self.contentparams.get('type', 'xml').endswith('xml'): + # element declared itself as escaped markup, but it isn't really + self.contentparams['type'] = 'application/xhtml+xml' + if self.incontent and self.contentparams.get('type') == 'application/xhtml+xml': + tag = tag.split(':')[-1] + self.handle_data('' % tag, escape=0) + + # track xml:base and xml:lang going out of scope + if self.basestack: + self.basestack.pop() + if self.basestack and self.basestack[-1]: + self.baseuri = self.basestack[-1] + if self.langstack: + self.langstack.pop() + if self.langstack: # and (self.langstack[-1] is not None): + self.lang = self.langstack[-1] + + def handle_charref(self, ref): + # called for each character reference, e.g. for ' ', ref will be '160' + if not self.elementstack: return + ref = ref.lower() + if ref in ('34', '38', '39', '60', '62', 'x22', 'x26', 'x27', 'x3c', 'x3e'): + text = '&#%s;' % ref + else: + if ref[0] == 'x': + c = int(ref[1:], 16) + else: + c = int(ref) + text = unichr(c).encode('utf-8') + self.elementstack[-1][2].append(text) + + def handle_entityref(self, ref): + # called for each entity reference, e.g. for '©', ref will be 'copy' + if not self.elementstack: return + if _debug: sys.stderr.write('entering handle_entityref with %s\n' % ref) + if ref in ('lt', 'gt', 'quot', 'amp', 'apos'): + text = '&%s;' % ref + else: + # entity resolution graciously donated by Aaron Swartz + def name2cp(k): + import htmlentitydefs + if hasattr(htmlentitydefs, 'name2codepoint'): # requires Python 2.3 + return htmlentitydefs.name2codepoint[k] + k = htmlentitydefs.entitydefs[k] + if k.startswith('&#') and k.endswith(';'): + return int(k[2:-1]) # not in latin-1 + return ord(k) + try: name2cp(ref) + except KeyError: text = '&%s;' % ref + else: text = unichr(name2cp(ref)).encode('utf-8') + self.elementstack[-1][2].append(text) + + def handle_data(self, text, escape=1): + # called for each block of plain text, i.e. outside of any tag and + # not containing any character or entity references + if not self.elementstack: return + if escape and self.contentparams.get('type') == 'application/xhtml+xml': + text = _xmlescape(text) + self.elementstack[-1][2].append(text) + + def handle_comment(self, text): + # called for each comment, e.g. + pass + + def handle_pi(self, text): + # called for each processing instruction, e.g. + pass + + def handle_decl(self, text): + pass + + def parse_declaration(self, i): + # override internal declaration handler to handle CDATA blocks + if _debug: sys.stderr.write('entering parse_declaration\n') + if self.rawdata[i:i+9] == '', i) + if k == -1: k = len(self.rawdata) + self.handle_data(_xmlescape(self.rawdata[i+9:k]), 0) + return k+3 + else: + k = self.rawdata.find('>', i) + return k+1 + + def mapContentType(self, contentType): + contentType = contentType.lower() + if contentType == 'text': + contentType = 'text/plain' + elif contentType == 'html': + contentType = 'text/html' + elif contentType == 'xhtml': + contentType = 'application/xhtml+xml' + return contentType + + def trackNamespace(self, prefix, uri): + loweruri = uri.lower() + if (prefix, loweruri) == (None, 'http://my.netscape.com/rdf/simple/0.9/') and not self.version: + self.version = 'rss090' + if loweruri == 'http://purl.org/rss/1.0/' and not self.version: + self.version = 'rss10' + if loweruri == 'http://www.w3.org/2005/atom' and not self.version: + self.version = 'atom10' + if loweruri.find('backend.userland.com/rss') <> -1: + # match any backend.userland.com namespace + uri = 'http://backend.userland.com/rss' + loweruri = uri + if self._matchnamespaces.has_key(loweruri): + self.namespacemap[prefix] = self._matchnamespaces[loweruri] + self.namespacesInUse[self._matchnamespaces[loweruri]] = uri + else: + self.namespacesInUse[prefix or ''] = uri + + def resolveURI(self, uri): + return _urljoin(self.baseuri or '', uri) + + def decodeEntities(self, element, data): + return data + + def push(self, element, expectingText): + self.elementstack.append([element, expectingText, []]) + + def pop(self, element, stripWhitespace=1): + if not self.elementstack: return + if self.elementstack[-1][0] != element: return + + element, expectingText, pieces = self.elementstack.pop() + output = ''.join(pieces) + if stripWhitespace: + output = output.strip() + if not expectingText: return output + + # decode base64 content + if base64 and self.contentparams.get('base64', 0): + try: + output = base64.decodestring(output) + except binascii.Error: + pass + except binascii.Incomplete: + pass + + # resolve relative URIs + if (element in self.can_be_relative_uri) and output: + output = self.resolveURI(output) + + # decode entities within embedded markup + if not self.contentparams.get('base64', 0): + output = self.decodeEntities(element, output) + + # remove temporary cruft from contentparams + try: + del self.contentparams['mode'] + except KeyError: + pass + try: + del self.contentparams['base64'] + except KeyError: + pass + + # resolve relative URIs within embedded markup + if self.mapContentType(self.contentparams.get('type', 'text/html')) in self.html_types: + if element in self.can_contain_relative_uris: + output = _resolveRelativeURIs(output, self.baseuri, self.encoding) + + # sanitize embedded markup + if self.mapContentType(self.contentparams.get('type', 'text/html')) in self.html_types: + if element in self.can_contain_dangerous_markup: + output = _sanitizeHTML(output, self.encoding) + + if self.encoding and type(output) != type(u''): + try: + output = unicode(output, self.encoding) + except: + pass + + # categories/tags/keywords/whatever are handled in _end_category + if element == 'category': + return output + + # store output in appropriate place(s) + if self.inentry and not self.insource: + if element == 'content': + self.entries[-1].setdefault(element, []) + contentparams = copy.deepcopy(self.contentparams) + contentparams['value'] = output + self.entries[-1][element].append(contentparams) + elif element == 'link': + self.entries[-1][element] = output + if output: + self.entries[-1]['links'][-1]['href'] = output + else: + if element == 'description': + element = 'summary' + self.entries[-1][element] = output + if self.incontent: + contentparams = copy.deepcopy(self.contentparams) + contentparams['value'] = output + self.entries[-1][element + '_detail'] = contentparams + elif (self.infeed or self.insource) and (not self.intextinput) and (not self.inimage): + context = self._getContext() + if element == 'description': + element = 'subtitle' + context[element] = output + if element == 'link': + context['links'][-1]['href'] = output + elif self.incontent: + contentparams = copy.deepcopy(self.contentparams) + contentparams['value'] = output + context[element + '_detail'] = contentparams + return output + + def pushContent(self, tag, attrsD, defaultContentType, expectingText): + self.incontent += 1 + self.contentparams = FeedParserDict({ + 'type': self.mapContentType(attrsD.get('type', defaultContentType)), + 'language': self.lang, + 'base': self.baseuri}) + self.contentparams['base64'] = self._isBase64(attrsD, self.contentparams) + self.push(tag, expectingText) + + def popContent(self, tag): + value = self.pop(tag) + self.incontent -= 1 + self.contentparams.clear() + return value + + def _mapToStandardPrefix(self, name): + colonpos = name.find(':') + if colonpos <> -1: + prefix = name[:colonpos] + suffix = name[colonpos+1:] + prefix = self.namespacemap.get(prefix, prefix) + name = prefix + ':' + suffix + return name + + def _getAttribute(self, attrsD, name): + return attrsD.get(self._mapToStandardPrefix(name)) + + def _isBase64(self, attrsD, contentparams): + if attrsD.get('mode', '') == 'base64': + return 1 + if self.contentparams['type'].startswith('text/'): + return 0 + if self.contentparams['type'].endswith('+xml'): + return 0 + if self.contentparams['type'].endswith('/xml'): + return 0 + return 1 + + def _itsAnHrefDamnIt(self, attrsD): + href = attrsD.get('url', attrsD.get('uri', attrsD.get('href', None))) + if href: + try: + del attrsD['url'] + except KeyError: + pass + try: + del attrsD['uri'] + except KeyError: + pass + attrsD['href'] = href + return attrsD + + def _save(self, key, value): + context = self._getContext() + context.setdefault(key, value) + + def _start_rss(self, attrsD): + versionmap = {'0.91': 'rss091u', + '0.92': 'rss092', + '0.93': 'rss093', + '0.94': 'rss094'} + if not self.version: + attr_version = attrsD.get('version', '') + version = versionmap.get(attr_version) + if version: + self.version = version + elif attr_version.startswith('2.'): + self.version = 'rss20' + else: + self.version = 'rss' + + def _start_dlhottitles(self, attrsD): + self.version = 'hotrss' + + def _start_channel(self, attrsD): + self.infeed = 1 + self._cdf_common(attrsD) + _start_feedinfo = _start_channel + + def _cdf_common(self, attrsD): + if attrsD.has_key('lastmod'): + self._start_modified({}) + self.elementstack[-1][-1] = attrsD['lastmod'] + self._end_modified() + if attrsD.has_key('href'): + self._start_link({}) + self.elementstack[-1][-1] = attrsD['href'] + self._end_link() + + def _start_feed(self, attrsD): + self.infeed = 1 + versionmap = {'0.1': 'atom01', + '0.2': 'atom02', + '0.3': 'atom03'} + if not self.version: + attr_version = attrsD.get('version') + version = versionmap.get(attr_version) + if version: + self.version = version + else: + self.version = 'atom' + + def _end_channel(self): + self.infeed = 0 + _end_feed = _end_channel + + def _start_image(self, attrsD): + self.inimage = 1 + self.push('image', 0) + context = self._getContext() + context.setdefault('image', FeedParserDict()) + + def _end_image(self): + self.pop('image') + self.inimage = 0 + + def _start_textinput(self, attrsD): + self.intextinput = 1 + self.push('textinput', 0) + context = self._getContext() + context.setdefault('textinput', FeedParserDict()) + _start_textInput = _start_textinput + + def _end_textinput(self): + self.pop('textinput') + self.intextinput = 0 + _end_textInput = _end_textinput + + def _start_author(self, attrsD): + self.inauthor = 1 + self.push('author', 1) + _start_managingeditor = _start_author + _start_dc_author = _start_author + _start_dc_creator = _start_author + _start_itunes_author = _start_author + + def _end_author(self): + self.pop('author') + self.inauthor = 0 + self._sync_author_detail() + _end_managingeditor = _end_author + _end_dc_author = _end_author + _end_dc_creator = _end_author + _end_itunes_author = _end_author + + def _start_itunes_owner(self, attrsD): + self.inpublisher = 1 + self.push('publisher', 0) + + def _end_itunes_owner(self): + self.pop('publisher') + self.inpublisher = 0 + self._sync_author_detail('publisher') + + def _start_contributor(self, attrsD): + self.incontributor = 1 + context = self._getContext() + context.setdefault('contributors', []) + context['contributors'].append(FeedParserDict()) + self.push('contributor', 0) + + def _end_contributor(self): + self.pop('contributor') + self.incontributor = 0 + + def _start_dc_contributor(self, attrsD): + self.incontributor = 1 + context = self._getContext() + context.setdefault('contributors', []) + context['contributors'].append(FeedParserDict()) + self.push('name', 0) + + def _end_dc_contributor(self): + self._end_name() + self.incontributor = 0 + + def _start_name(self, attrsD): + self.push('name', 0) + _start_itunes_name = _start_name + + def _end_name(self): + value = self.pop('name') + if self.inpublisher: + self._save_author('name', value, 'publisher') + elif self.inauthor: + self._save_author('name', value) + elif self.incontributor: + self._save_contributor('name', value) + elif self.intextinput: + context = self._getContext() + context['textinput']['name'] = value + _end_itunes_name = _end_name + + def _start_width(self, attrsD): + self.push('width', 0) + + def _end_width(self): + value = self.pop('width') + try: + value = int(value) + except: + value = 0 + if self.inimage: + context = self._getContext() + context['image']['width'] = value + + def _start_height(self, attrsD): + self.push('height', 0) + + def _end_height(self): + value = self.pop('height') + try: + value = int(value) + except: + value = 0 + if self.inimage: + context = self._getContext() + context['image']['height'] = value + + def _start_url(self, attrsD): + self.push('href', 1) + _start_homepage = _start_url + _start_uri = _start_url + + def _end_url(self): + value = self.pop('href') + if self.inauthor: + self._save_author('href', value) + elif self.incontributor: + self._save_contributor('href', value) + elif self.inimage: + context = self._getContext() + context['image']['href'] = value + elif self.intextinput: + context = self._getContext() + context['textinput']['link'] = value + _end_homepage = _end_url + _end_uri = _end_url + + def _start_email(self, attrsD): + self.push('email', 0) + _start_itunes_email = _start_email + + def _end_email(self): + value = self.pop('email') + if self.inpublisher: + self._save_author('email', value, 'publisher') + elif self.inauthor: + self._save_author('email', value) + elif self.incontributor: + self._save_contributor('email', value) + _end_itunes_email = _end_email + + def _getContext(self): + if self.insource: + context = self.sourcedata + elif self.inentry: + context = self.entries[-1] + else: + context = self.feeddata + return context + + def _save_author(self, key, value, prefix='author'): + context = self._getContext() + context.setdefault(prefix + '_detail', FeedParserDict()) + context[prefix + '_detail'][key] = value + self._sync_author_detail() + + def _save_contributor(self, key, value): + context = self._getContext() + context.setdefault('contributors', [FeedParserDict()]) + context['contributors'][-1][key] = value + + def _sync_author_detail(self, key='author'): + context = self._getContext() + detail = context.get('%s_detail' % key) + if detail: + name = detail.get('name') + email = detail.get('email') + if name and email: + context[key] = '%s (%s)' % (name, email) + elif name: + context[key] = name + elif email: + context[key] = email + else: + author = context.get(key) + if not author: return + emailmatch = re.search(r'''(([a-zA-Z0-9\_\-\.\+]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?))''', author) + if not emailmatch: return + email = emailmatch.group(0) + # probably a better way to do the following, but it passes all the tests + author = author.replace(email, '') + author = author.replace('()', '') + author = author.strip() + if author and (author[0] == '('): + author = author[1:] + if author and (author[-1] == ')'): + author = author[:-1] + author = author.strip() + context.setdefault('%s_detail' % key, FeedParserDict()) + context['%s_detail' % key]['name'] = author + context['%s_detail' % key]['email'] = email + + def _start_subtitle(self, attrsD): + self.pushContent('subtitle', attrsD, 'text/plain', 1) + _start_tagline = _start_subtitle + _start_itunes_subtitle = _start_subtitle + + def _end_subtitle(self): + self.popContent('subtitle') + _end_tagline = _end_subtitle + _end_itunes_subtitle = _end_subtitle + + def _start_rights(self, attrsD): + self.pushContent('rights', attrsD, 'text/plain', 1) + _start_dc_rights = _start_rights + _start_copyright = _start_rights + + def _end_rights(self): + self.popContent('rights') + _end_dc_rights = _end_rights + _end_copyright = _end_rights + + def _start_item(self, attrsD): + self.entries.append(FeedParserDict()) + self.push('item', 0) + self.inentry = 1 + self.guidislink = 0 + id = self._getAttribute(attrsD, 'rdf:about') + if id: + context = self._getContext() + context['id'] = id + self._cdf_common(attrsD) + _start_entry = _start_item + _start_product = _start_item + + def _end_item(self): + self.pop('item') + self.inentry = 0 + _end_entry = _end_item + + def _start_dc_language(self, attrsD): + self.push('language', 1) + _start_language = _start_dc_language + + def _end_dc_language(self): + self.lang = self.pop('language') + _end_language = _end_dc_language + + def _start_dc_publisher(self, attrsD): + self.push('publisher', 1) + _start_webmaster = _start_dc_publisher + + def _end_dc_publisher(self): + self.pop('publisher') + self._sync_author_detail('publisher') + _end_webmaster = _end_dc_publisher + + def _start_published(self, attrsD): + self.push('published', 1) + _start_dcterms_issued = _start_published + _start_issued = _start_published + + def _end_published(self): + value = self.pop('published') + self._save('published_parsed', _parse_date(value)) + _end_dcterms_issued = _end_published + _end_issued = _end_published + + def _start_updated(self, attrsD): + self.push('updated', 1) + _start_modified = _start_updated + _start_dcterms_modified = _start_updated + _start_pubdate = _start_updated + _start_dc_date = _start_updated + + def _end_updated(self): + value = self.pop('updated') + parsed_value = _parse_date(value) + self._save('updated_parsed', parsed_value) + _end_modified = _end_updated + _end_dcterms_modified = _end_updated + _end_pubdate = _end_updated + _end_dc_date = _end_updated + + def _start_created(self, attrsD): + self.push('created', 1) + _start_dcterms_created = _start_created + + def _end_created(self): + value = self.pop('created') + self._save('created_parsed', _parse_date(value)) + _end_dcterms_created = _end_created + + def _start_expirationdate(self, attrsD): + self.push('expired', 1) + + def _end_expirationdate(self): + self._save('expired_parsed', _parse_date(self.pop('expired'))) + + def _start_cc_license(self, attrsD): + self.push('license', 1) + value = self._getAttribute(attrsD, 'rdf:resource') + if value: + self.elementstack[-1][2].append(value) + self.pop('license') + + def _start_creativecommons_license(self, attrsD): + self.push('license', 1) + + def _end_creativecommons_license(self): + self.pop('license') + + def _addTag(self, term, scheme, label): + context = self._getContext() + tags = context.setdefault('tags', []) + if (not term) and (not scheme) and (not label): return + value = FeedParserDict({'term': term, 'scheme': scheme, 'label': label}) + if value not in tags: + tags.append(FeedParserDict({'term': term, 'scheme': scheme, 'label': label})) + + def _start_category(self, attrsD): + if _debug: sys.stderr.write('entering _start_category with %s\n' % repr(attrsD)) + term = attrsD.get('term') + scheme = attrsD.get('scheme', attrsD.get('domain')) + label = attrsD.get('label') + self._addTag(term, scheme, label) + self.push('category', 1) + _start_dc_subject = _start_category + _start_keywords = _start_category + + def _end_itunes_keywords(self): + for term in self.pop('itunes_keywords').split(): + self._addTag(term, 'http://www.itunes.com/', None) + + def _start_itunes_category(self, attrsD): + self._addTag(attrsD.get('text'), 'http://www.itunes.com/', None) + self.push('category', 1) + + def _end_category(self): + value = self.pop('category') + if not value: return + context = self._getContext() + tags = context['tags'] + if value and len(tags) and not tags[-1]['term']: + tags[-1]['term'] = value + else: + self._addTag(value, None, None) + _end_dc_subject = _end_category + _end_keywords = _end_category + _end_itunes_category = _end_category + + def _start_cloud(self, attrsD): + self._getContext()['cloud'] = FeedParserDict(attrsD) + + def _start_link(self, attrsD): + attrsD.setdefault('rel', 'alternate') + attrsD.setdefault('type', 'text/html') + attrsD = self._itsAnHrefDamnIt(attrsD) + if attrsD.has_key('href'): + attrsD['href'] = self.resolveURI(attrsD['href']) + expectingText = self.infeed or self.inentry or self.insource + context = self._getContext() + context.setdefault('links', []) + context['links'].append(FeedParserDict(attrsD)) + if attrsD['rel'] == 'enclosure': + self._start_enclosure(attrsD) + if attrsD.has_key('href'): + expectingText = 0 + if (attrsD.get('rel') == 'alternate') and (self.mapContentType(attrsD.get('type')) in self.html_types): + context['link'] = attrsD['href'] + else: + self.push('link', expectingText) + _start_producturl = _start_link + + def _end_link(self): + value = self.pop('link') + context = self._getContext() + if self.intextinput: + context['textinput']['link'] = value + if self.inimage: + context['image']['link'] = value + _end_producturl = _end_link + + def _start_guid(self, attrsD): + self.guidislink = (attrsD.get('ispermalink', 'true') == 'true') + self.push('id', 1) + + def _end_guid(self): + value = self.pop('id') + self._save('guidislink', self.guidislink and not self._getContext().has_key('link')) + if self.guidislink: + # guid acts as link, but only if 'ispermalink' is not present or is 'true', + # and only if the item doesn't already have a link element + self._save('link', value) + + def _start_title(self, attrsD): + self.pushContent('title', attrsD, 'text/plain', self.infeed or self.inentry or self.insource) + _start_dc_title = _start_title + _start_media_title = _start_title + + def _end_title(self): + value = self.popContent('title') + context = self._getContext() + if self.intextinput: + context['textinput']['title'] = value + elif self.inimage: + context['image']['title'] = value + _end_dc_title = _end_title + _end_media_title = _end_title + + def _start_description(self, attrsD): + context = self._getContext() + if context.has_key('summary'): + self._summaryKey = 'content' + self._start_content(attrsD) + else: + self.pushContent('description', attrsD, 'text/html', self.infeed or self.inentry or self.insource) + + def _start_abstract(self, attrsD): + self.pushContent('description', attrsD, 'text/plain', self.infeed or self.inentry or self.insource) + + def _end_description(self): + if self._summaryKey == 'content': + self._end_content() + else: + value = self.popContent('description') + context = self._getContext() + if self.intextinput: + context['textinput']['description'] = value + elif self.inimage: + context['image']['description'] = value + self._summaryKey = None + _end_abstract = _end_description + + def _start_info(self, attrsD): + self.pushContent('info', attrsD, 'text/plain', 1) + _start_feedburner_browserfriendly = _start_info + + def _end_info(self): + self.popContent('info') + _end_feedburner_browserfriendly = _end_info + + def _start_generator(self, attrsD): + if attrsD: + attrsD = self._itsAnHrefDamnIt(attrsD) + if attrsD.has_key('href'): + attrsD['href'] = self.resolveURI(attrsD['href']) + self._getContext()['generator_detail'] = FeedParserDict(attrsD) + self.push('generator', 1) + + def _end_generator(self): + value = self.pop('generator') + context = self._getContext() + if context.has_key('generator_detail'): + context['generator_detail']['name'] = value + + def _start_admin_generatoragent(self, attrsD): + self.push('generator', 1) + value = self._getAttribute(attrsD, 'rdf:resource') + if value: + self.elementstack[-1][2].append(value) + self.pop('generator') + self._getContext()['generator_detail'] = FeedParserDict({'href': value}) + + def _start_admin_errorreportsto(self, attrsD): + self.push('errorreportsto', 1) + value = self._getAttribute(attrsD, 'rdf:resource') + if value: + self.elementstack[-1][2].append(value) + self.pop('errorreportsto') + + def _start_summary(self, attrsD): + context = self._getContext() + if context.has_key('summary'): + self._summaryKey = 'content' + self._start_content(attrsD) + else: + self._summaryKey = 'summary' + self.pushContent(self._summaryKey, attrsD, 'text/plain', 1) + _start_itunes_summary = _start_summary + + def _end_summary(self): + if self._summaryKey == 'content': + self._end_content() + else: + self.popContent(self._summaryKey or 'summary') + self._summaryKey = None + _end_itunes_summary = _end_summary + + def _start_enclosure(self, attrsD): + attrsD = self._itsAnHrefDamnIt(attrsD) + self._getContext().setdefault('enclosures', []).append(FeedParserDict(attrsD)) + href = attrsD.get('href') + if href: + context = self._getContext() + if not context.get('id'): + context['id'] = href + + def _start_source(self, attrsD): + self.insource = 1 + + def _end_source(self): + self.insource = 0 + self._getContext()['source'] = copy.deepcopy(self.sourcedata) + self.sourcedata.clear() + + def _start_content(self, attrsD): + self.pushContent('content', attrsD, 'text/plain', 1) + src = attrsD.get('src') + if src: + self.contentparams['src'] = src + self.push('content', 1) + + def _start_prodlink(self, attrsD): + self.pushContent('content', attrsD, 'text/html', 1) + + def _start_body(self, attrsD): + self.pushContent('content', attrsD, 'application/xhtml+xml', 1) + _start_xhtml_body = _start_body + + def _start_content_encoded(self, attrsD): + self.pushContent('content', attrsD, 'text/html', 1) + _start_fullitem = _start_content_encoded + + def _end_content(self): + copyToDescription = self.mapContentType(self.contentparams.get('type')) in (['text/plain'] + self.html_types) + value = self.popContent('content') + if copyToDescription: + self._save('description', value) + _end_body = _end_content + _end_xhtml_body = _end_content + _end_content_encoded = _end_content + _end_fullitem = _end_content + _end_prodlink = _end_content + + def _start_itunes_image(self, attrsD): + self.push('itunes_image', 0) + self._getContext()['image'] = FeedParserDict({'href': attrsD.get('href')}) + _start_itunes_link = _start_itunes_image + + def _end_itunes_block(self): + value = self.pop('itunes_block', 0) + self._getContext()['itunes_block'] = (value == 'yes') and 1 or 0 + + def _end_itunes_explicit(self): + value = self.pop('itunes_explicit', 0) + self._getContext()['itunes_explicit'] = (value == 'yes') and 1 or 0 + +if _XML_AVAILABLE: + class _StrictFeedParser(_FeedParserMixin, xml.sax.handler.ContentHandler): + def __init__(self, baseuri, baselang, encoding): + if _debug: sys.stderr.write('trying StrictFeedParser\n') + xml.sax.handler.ContentHandler.__init__(self) + _FeedParserMixin.__init__(self, baseuri, baselang, encoding) + self.bozo = 0 + self.exc = None + + def startPrefixMapping(self, prefix, uri): + self.trackNamespace(prefix, uri) + + def startElementNS(self, name, qname, attrs): + namespace, localname = name + lowernamespace = str(namespace or '').lower() + if lowernamespace.find('backend.userland.com/rss') <> -1: + # match any backend.userland.com namespace + namespace = 'http://backend.userland.com/rss' + lowernamespace = namespace + if qname and qname.find(':') > 0: + givenprefix = qname.split(':')[0] + else: + givenprefix = None + prefix = self._matchnamespaces.get(lowernamespace, givenprefix) + if givenprefix and (prefix == None or (prefix == '' and lowernamespace == '')) and not self.namespacesInUse.has_key(givenprefix): + raise UndeclaredNamespace, "'%s' is not associated with a namespace" % givenprefix + if prefix: + localname = prefix + ':' + localname + localname = str(localname).lower() + if _debug: sys.stderr.write('startElementNS: qname = %s, namespace = %s, givenprefix = %s, prefix = %s, attrs = %s, localname = %s\n' % (qname, namespace, givenprefix, prefix, attrs.items(), localname)) + + # qname implementation is horribly broken in Python 2.1 (it + # doesn't report any), and slightly broken in Python 2.2 (it + # doesn't report the xml: namespace). So we match up namespaces + # with a known list first, and then possibly override them with + # the qnames the SAX parser gives us (if indeed it gives us any + # at all). Thanks to MatejC for helping me test this and + # tirelessly telling me that it didn't work yet. + attrsD = {} + for (namespace, attrlocalname), attrvalue in attrs._attrs.items(): + lowernamespace = (namespace or '').lower() + prefix = self._matchnamespaces.get(lowernamespace, '') + if prefix: + attrlocalname = prefix + ':' + attrlocalname + attrsD[str(attrlocalname).lower()] = attrvalue + for qname in attrs.getQNames(): + attrsD[str(qname).lower()] = attrs.getValueByQName(qname) + self.unknown_starttag(localname, attrsD.items()) + + def characters(self, text): + self.handle_data(text) + + def endElementNS(self, name, qname): + namespace, localname = name + lowernamespace = str(namespace or '').lower() + if qname and qname.find(':') > 0: + givenprefix = qname.split(':')[0] + else: + givenprefix = '' + prefix = self._matchnamespaces.get(lowernamespace, givenprefix) + if prefix: + localname = prefix + ':' + localname + localname = str(localname).lower() + self.unknown_endtag(localname) + + def error(self, exc): + self.bozo = 1 + self.exc = exc + + def fatalError(self, exc): + self.error(exc) + raise exc + +class _BaseHTMLProcessor(sgmllib.SGMLParser): + elements_no_end_tag = ['area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', + 'img', 'input', 'isindex', 'link', 'meta', 'param'] + + def __init__(self, encoding): + self.encoding = encoding + if _debug: sys.stderr.write('entering BaseHTMLProcessor, encoding=%s\n' % self.encoding) + sgmllib.SGMLParser.__init__(self) + + def reset(self): + self.pieces = [] + sgmllib.SGMLParser.reset(self) + + def _shorttag_replace(self, match): + tag = match.group(1) + if tag in self.elements_no_end_tag: + return '<' + tag + ' />' + else: + return '<' + tag + '>' + + def feed(self, data): + data = re.compile(r'', self._shorttag_replace, data) # bug [ 1399464 ] Bad regexp for _shorttag_replace + data = re.sub(r'<([^<\s]+?)\s*/>', self._shorttag_replace, data) + data = data.replace(''', "'") + data = data.replace('"', '"') + if self.encoding and type(data) == type(u''): + data = data.encode(self.encoding) + sgmllib.SGMLParser.feed(self, data) + + def normalize_attrs(self, attrs): + # utility method to be called by descendants + attrs = [(k.lower(), v) for k, v in attrs] + attrs = [(k, k in ('rel', 'type') and v.lower() or v) for k, v in attrs] + return attrs + + def unknown_starttag(self, tag, attrs): + # called for each start tag + # attrs is a list of (attr, value) tuples + # e.g. for 
, tag='pre', attrs=[('class', 'screen')]
+        if _debug: sys.stderr.write('_BaseHTMLProcessor, unknown_starttag, tag=%s\n' % tag)
+        uattrs = []
+        # thanks to Kevin Marks for this breathtaking hack to deal with (valid) high-bit attribute values in UTF-8 feeds
+        for key, value in attrs:
+            if type(value) != type(u''):
+                value = unicode(value, self.encoding)
+            uattrs.append((unicode(key, self.encoding), value))
+        strattrs = u''.join([u' %s="%s"' % (key, value) for key, value in uattrs]).encode(self.encoding)
+        if tag in self.elements_no_end_tag:
+            self.pieces.append('<%(tag)s%(strattrs)s />' % locals())
+        else:
+            self.pieces.append('<%(tag)s%(strattrs)s>' % locals())
+
+    def unknown_endtag(self, tag):
+        # called for each end tag, e.g. for
, tag will be 'pre' + # Reconstruct the original end tag. + if tag not in self.elements_no_end_tag: + self.pieces.append("" % locals()) + + def handle_charref(self, ref): + # called for each character reference, e.g. for ' ', ref will be '160' + # Reconstruct the original character reference. + self.pieces.append('&#%(ref)s;' % locals()) + + def handle_entityref(self, ref): + # called for each entity reference, e.g. for '©', ref will be 'copy' + # Reconstruct the original entity reference. + self.pieces.append('&%(ref)s;' % locals()) + + def handle_data(self, text): + # called for each block of plain text, i.e. outside of any tag and + # not containing any character or entity references + # Store the original text verbatim. + if _debug: sys.stderr.write('_BaseHTMLProcessor, handle_text, text=%s\n' % text) + self.pieces.append(text) + + def handle_comment(self, text): + # called for each HTML comment, e.g. + # Reconstruct the original comment. + self.pieces.append('' % locals()) + + def handle_pi(self, text): + # called for each processing instruction, e.g. + # Reconstruct original processing instruction. + self.pieces.append('' % locals()) + + def handle_decl(self, text): + # called for the DOCTYPE, if present, e.g. + # + # Reconstruct original DOCTYPE + self.pieces.append('' % locals()) + + _new_declname_match = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9:]*\s*').match + def _scan_name(self, i, declstartpos): + rawdata = self.rawdata + n = len(rawdata) + if i == n: + return None, -1 + m = self._new_declname_match(rawdata, i) + if m: + s = m.group() + name = s.strip() + if (i + len(s)) == n: + return None, -1 # end of buffer + return name.lower(), m.end() + else: + self.handle_data(rawdata) +# self.updatepos(declstartpos, i) + return None, -1 + + def output(self): + '''Return processed HTML as a single string''' + return ''.join([str(p) for p in self.pieces]) + +class _LooseFeedParser(_FeedParserMixin, _BaseHTMLProcessor): + def __init__(self, baseuri, baselang, encoding): + sgmllib.SGMLParser.__init__(self) + _FeedParserMixin.__init__(self, baseuri, baselang, encoding) + + def decodeEntities(self, element, data): + data = data.replace('<', '<') + data = data.replace('<', '<') + data = data.replace('>', '>') + data = data.replace('>', '>') + data = data.replace('&', '&') + data = data.replace('&', '&') + data = data.replace('"', '"') + data = data.replace('"', '"') + data = data.replace(''', ''') + data = data.replace(''', ''') + if self.contentparams.has_key('type') and not self.contentparams.get('type', 'xml').endswith('xml'): + data = data.replace('<', '<') + data = data.replace('>', '>') + data = data.replace('&', '&') + data = data.replace('"', '"') + data = data.replace(''', "'") + return data + +class _RelativeURIResolver(_BaseHTMLProcessor): + relative_uris = [('a', 'href'), + ('applet', 'codebase'), + ('area', 'href'), + ('blockquote', 'cite'), + ('body', 'background'), + ('del', 'cite'), + ('form', 'action'), + ('frame', 'longdesc'), + ('frame', 'src'), + ('iframe', 'longdesc'), + ('iframe', 'src'), + ('head', 'profile'), + ('img', 'longdesc'), + ('img', 'src'), + ('img', 'usemap'), + ('input', 'src'), + ('input', 'usemap'), + ('ins', 'cite'), + ('link', 'href'), + ('object', 'classid'), + ('object', 'codebase'), + ('object', 'data'), + ('object', 'usemap'), + ('q', 'cite'), + ('script', 'src')] + + def __init__(self, baseuri, encoding): + _BaseHTMLProcessor.__init__(self, encoding) + self.baseuri = baseuri + + def resolveURI(self, uri): + return _urljoin(self.baseuri, uri) + + def unknown_starttag(self, tag, attrs): + attrs = self.normalize_attrs(attrs) + attrs = [(key, ((tag, key) in self.relative_uris) and self.resolveURI(value) or value) for key, value in attrs] + _BaseHTMLProcessor.unknown_starttag(self, tag, attrs) + +def _resolveRelativeURIs(htmlSource, baseURI, encoding): + if _debug: sys.stderr.write('entering _resolveRelativeURIs\n') + p = _RelativeURIResolver(baseURI, encoding) + p.feed(htmlSource) + return p.output() + +class _HTMLSanitizer(_BaseHTMLProcessor): + acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b', 'big', + 'blockquote', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col', + 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'fieldset', + 'font', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'input', + 'ins', 'kbd', 'label', 'legend', 'li', 'map', 'menu', 'ol', 'optgroup', + 'option', 'p', 'pre', 'q', 's', 'samp', 'select', 'small', 'span', 'strike', + 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', + 'thead', 'tr', 'tt', 'u', 'ul', 'var'] + + acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey', + 'action', 'align', 'alt', 'axis', 'border', 'cellpadding', 'cellspacing', + 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'clear', 'cols', + 'colspan', 'color', 'compact', 'coords', 'datetime', 'dir', 'disabled', + 'enctype', 'for', 'frame', 'headers', 'height', 'href', 'hreflang', 'hspace', + 'id', 'ismap', 'label', 'lang', 'longdesc', 'maxlength', 'media', 'method', + 'multiple', 'name', 'nohref', 'noshade', 'nowrap', 'prompt', 'readonly', + 'rel', 'rev', 'rows', 'rowspan', 'rules', 'scope', 'selected', 'shape', 'size', + 'span', 'src', 'start', 'summary', 'tabindex', 'target', 'title', 'type', + 'usemap', 'valign', 'value', 'vspace', 'width'] + + unacceptable_elements_with_end_tag = ['script', 'applet'] + + def reset(self): + _BaseHTMLProcessor.reset(self) + self.unacceptablestack = 0 + + def unknown_starttag(self, tag, attrs): + if not tag in self.acceptable_elements: + if tag in self.unacceptable_elements_with_end_tag: + self.unacceptablestack += 1 + return + attrs = self.normalize_attrs(attrs) + attrs = [(key, value) for key, value in attrs if key in self.acceptable_attributes] + _BaseHTMLProcessor.unknown_starttag(self, tag, attrs) + + def unknown_endtag(self, tag): + if not tag in self.acceptable_elements: + if tag in self.unacceptable_elements_with_end_tag: + self.unacceptablestack -= 1 + return + _BaseHTMLProcessor.unknown_endtag(self, tag) + + def handle_pi(self, text): + pass + + def handle_decl(self, text): + pass + + def handle_data(self, text): + if not self.unacceptablestack: + _BaseHTMLProcessor.handle_data(self, text) + +def _sanitizeHTML(htmlSource, encoding): + p = _HTMLSanitizer(encoding) + p.feed(htmlSource) + data = p.output() + if TIDY_MARKUP: + # loop through list of preferred Tidy interfaces looking for one that's installed, + # then set up a common _tidy function to wrap the interface-specific API. + _tidy = None + for tidy_interface in PREFERRED_TIDY_INTERFACES: + try: + if tidy_interface == "uTidy": + from tidy import parseString as _utidy + def _tidy(data, **kwargs): + return str(_utidy(data, **kwargs)) + break + elif tidy_interface == "mxTidy": + from mx.Tidy import Tidy as _mxtidy + def _tidy(data, **kwargs): + nerrors, nwarnings, data, errordata = _mxtidy.tidy(data, **kwargs) + return data + break + except: + pass + if _tidy: + utf8 = type(data) == type(u'') + if utf8: + data = data.encode('utf-8') + data = _tidy(data, output_xhtml=1, numeric_entities=1, wrap=0, char_encoding="utf8") + if utf8: + data = unicode(data, 'utf-8') + if data.count(''): + data = data.split('>', 1)[1] + if data.count('= '2.3.3' + assert base64 != None + user, passw = base64.decodestring(req.headers['Authorization'].split(' ')[1]).split(':') + realm = re.findall('realm="([^"]*)"', headers['WWW-Authenticate'])[0] + self.add_password(realm, host, user, passw) + retry = self.http_error_auth_reqed('www-authenticate', host, req, headers) + self.reset_retry_count() + return retry + except: + return self.http_error_default(req, fp, code, msg, headers) + +def _open_resource(url_file_stream_or_string, etag, modified, agent, referrer, handlers): + """URL, filename, or string --> stream + + This function lets you define parsers that take any input source + (URL, pathname to local or network file, or actual data as a string) + and deal with it in a uniform manner. Returned object is guaranteed + to have all the basic stdio read methods (read, readline, readlines). + Just .close() the object when you're done with it. + + If the etag argument is supplied, it will be used as the value of an + If-None-Match request header. + + If the modified argument is supplied, it must be a tuple of 9 integers + as returned by gmtime() in the standard Python time module. This MUST + be in GMT (Greenwich Mean Time). The formatted date/time will be used + as the value of an If-Modified-Since request header. + + If the agent argument is supplied, it will be used as the value of a + User-Agent request header. + + If the referrer argument is supplied, it will be used as the value of a + Referer[sic] request header. + + If handlers is supplied, it is a list of handlers used to build a + urllib2 opener. + """ + + if hasattr(url_file_stream_or_string, 'read'): + return url_file_stream_or_string + + if url_file_stream_or_string == '-': + return sys.stdin + + if urlparse.urlparse(url_file_stream_or_string)[0] in ('http', 'https', 'ftp'): + if not agent: + agent = USER_AGENT + # test for inline user:password for basic auth + auth = None + if base64: + urltype, rest = urllib.splittype(url_file_stream_or_string) + realhost, rest = urllib.splithost(rest) + if realhost: + user_passwd, realhost = urllib.splituser(realhost) + if user_passwd: + url_file_stream_or_string = '%s://%s%s' % (urltype, realhost, rest) + auth = base64.encodestring(user_passwd).strip() + # try to open with urllib2 (to use optional headers) + request = urllib2.Request(url_file_stream_or_string) + request.add_header('User-Agent', agent) + if etag: + request.add_header('If-None-Match', etag) + if modified: + # format into an RFC 1123-compliant timestamp. We can't use + # time.strftime() since the %a and %b directives can be affected + # by the current locale, but RFC 2616 states that dates must be + # in English. + short_weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] + request.add_header('If-Modified-Since', '%s, %02d %s %04d %02d:%02d:%02d GMT' % (short_weekdays[modified[6]], modified[2], months[modified[1] - 1], modified[0], modified[3], modified[4], modified[5])) + if referrer: + request.add_header('Referer', referrer) + if gzip and zlib: + request.add_header('Accept-encoding', 'gzip, deflate') + elif gzip: + request.add_header('Accept-encoding', 'gzip') + elif zlib: + request.add_header('Accept-encoding', 'deflate') + else: + request.add_header('Accept-encoding', '') + if auth: + request.add_header('Authorization', 'Basic %s' % auth) + if ACCEPT_HEADER: + request.add_header('Accept', ACCEPT_HEADER) + request.add_header('A-IM', 'feed') # RFC 3229 support + opener = apply(urllib2.build_opener, tuple([_FeedURLHandler()] + handlers)) + opener.addheaders = [] # RMK - must clear so we only send our custom User-Agent + try: + return opener.open(request) + finally: + opener.close() # JohnD + + # try to open with native open function (if url_file_stream_or_string is a filename) + try: + return open(url_file_stream_or_string) + except: + pass + + # treat url_file_stream_or_string as string + return _StringIO(str(url_file_stream_or_string)) + +_date_handlers = [] +def registerDateHandler(func): + '''Register a date handler function (takes string, returns 9-tuple date in GMT)''' + _date_handlers.insert(0, func) + +# ISO-8601 date parsing routines written by Fazal Majid. +# The ISO 8601 standard is very convoluted and irregular - a full ISO 8601 +# parser is beyond the scope of feedparser and would be a worthwhile addition +# to the Python library. +# A single regular expression cannot parse ISO 8601 date formats into groups +# as the standard is highly irregular (for instance is 030104 2003-01-04 or +# 0301-04-01), so we use templates instead. +# Please note the order in templates is significant because we need a +# greedy match. +_iso8601_tmpl = ['YYYY-?MM-?DD', 'YYYY-MM', 'YYYY-?OOO', + 'YY-?MM-?DD', 'YY-?OOO', 'YYYY', + '-YY-?MM', '-OOO', '-YY', + '--MM-?DD', '--MM', + '---DD', + 'CC', ''] +_iso8601_re = [ + tmpl.replace( + 'YYYY', r'(?P\d{4})').replace( + 'YY', r'(?P\d\d)').replace( + 'MM', r'(?P[01]\d)').replace( + 'DD', r'(?P[0123]\d)').replace( + 'OOO', r'(?P[0123]\d\d)').replace( + 'CC', r'(?P\d\d$)') + + r'(T?(?P\d{2}):(?P\d{2})' + + r'(:(?P\d{2}))?' + + r'(?P[+-](?P\d{2})(:(?P\d{2}))?|Z)?)?' + for tmpl in _iso8601_tmpl] +del tmpl +_iso8601_matches = [re.compile(regex).match for regex in _iso8601_re] +del regex +def _parse_date_iso8601(dateString): + '''Parse a variety of ISO-8601-compatible formats like 20040105''' + m = None + for _iso8601_match in _iso8601_matches: + m = _iso8601_match(dateString) + if m: break + if not m: return + if m.span() == (0, 0): return + params = m.groupdict() + ordinal = params.get('ordinal', 0) + if ordinal: + ordinal = int(ordinal) + else: + ordinal = 0 + year = params.get('year', '--') + if not year or year == '--': + year = time.gmtime()[0] + elif len(year) == 2: + # ISO 8601 assumes current century, i.e. 93 -> 2093, NOT 1993 + year = 100 * int(time.gmtime()[0] / 100) + int(year) + else: + year = int(year) + month = params.get('month', '-') + if not month or month == '-': + # ordinals are NOT normalized by mktime, we simulate them + # by setting month=1, day=ordinal + if ordinal: + month = 1 + else: + month = time.gmtime()[1] + month = int(month) + day = params.get('day', 0) + if not day: + # see above + if ordinal: + day = ordinal + elif params.get('century', 0) or \ + params.get('year', 0) or params.get('month', 0): + day = 1 + else: + day = time.gmtime()[2] + else: + day = int(day) + # special case of the century - is the first year of the 21st century + # 2000 or 2001 ? The debate goes on... + if 'century' in params.keys(): + year = (int(params['century']) - 1) * 100 + 1 + # in ISO 8601 most fields are optional + for field in ['hour', 'minute', 'second', 'tzhour', 'tzmin']: + if not params.get(field, None): + params[field] = 0 + hour = int(params.get('hour', 0)) + minute = int(params.get('minute', 0)) + second = int(params.get('second', 0)) + # weekday is normalized by mktime(), we can ignore it + weekday = 0 + # daylight savings is complex, but not needed for feedparser's purposes + # as time zones, if specified, include mention of whether it is active + # (e.g. PST vs. PDT, CET). Using -1 is implementation-dependent and + # and most implementations have DST bugs + daylight_savings_flag = 0 + tm = [year, month, day, hour, minute, second, weekday, + ordinal, daylight_savings_flag] + # ISO 8601 time zone adjustments + tz = params.get('tz') + if tz and tz != 'Z': + if tz[0] == '-': + tm[3] += int(params.get('tzhour', 0)) + tm[4] += int(params.get('tzmin', 0)) + elif tz[0] == '+': + tm[3] -= int(params.get('tzhour', 0)) + tm[4] -= int(params.get('tzmin', 0)) + else: + return None + # Python's time.mktime() is a wrapper around the ANSI C mktime(3c) + # which is guaranteed to normalize d/m/y/h/m/s. + # Many implementations have bugs, but we'll pretend they don't. + return time.localtime(time.mktime(tm)) +registerDateHandler(_parse_date_iso8601) + +# 8-bit date handling routines written by ytrewq1. +_korean_year = u'\ub144' # b3e2 in euc-kr +_korean_month = u'\uc6d4' # bff9 in euc-kr +_korean_day = u'\uc77c' # c0cf in euc-kr +_korean_am = u'\uc624\uc804' # bfc0 c0fc in euc-kr +_korean_pm = u'\uc624\ud6c4' # bfc0 c8c4 in euc-kr + +_korean_onblog_date_re = \ + re.compile('(\d{4})%s\s+(\d{2})%s\s+(\d{2})%s\s+(\d{2}):(\d{2}):(\d{2})' % \ + (_korean_year, _korean_month, _korean_day)) +_korean_nate_date_re = \ + re.compile(u'(\d{4})-(\d{2})-(\d{2})\s+(%s|%s)\s+(\d{,2}):(\d{,2}):(\d{,2})' % \ + (_korean_am, _korean_pm)) +def _parse_date_onblog(dateString): + '''Parse a string according to the OnBlog 8-bit date format''' + m = _korean_onblog_date_re.match(dateString) + if not m: return + w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s:%(second)s%(zonediff)s' % \ + {'year': m.group(1), 'month': m.group(2), 'day': m.group(3),\ + 'hour': m.group(4), 'minute': m.group(5), 'second': m.group(6),\ + 'zonediff': '+09:00'} + if _debug: sys.stderr.write('OnBlog date parsed as: %s\n' % w3dtfdate) + return _parse_date_w3dtf(w3dtfdate) +registerDateHandler(_parse_date_onblog) + +def _parse_date_nate(dateString): + '''Parse a string according to the Nate 8-bit date format''' + m = _korean_nate_date_re.match(dateString) + if not m: return + hour = int(m.group(5)) + ampm = m.group(4) + if (ampm == _korean_pm): + hour += 12 + hour = str(hour) + if len(hour) == 1: + hour = '0' + hour + w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s:%(second)s%(zonediff)s' % \ + {'year': m.group(1), 'month': m.group(2), 'day': m.group(3),\ + 'hour': hour, 'minute': m.group(6), 'second': m.group(7),\ + 'zonediff': '+09:00'} + if _debug: sys.stderr.write('Nate date parsed as: %s\n' % w3dtfdate) + return _parse_date_w3dtf(w3dtfdate) +registerDateHandler(_parse_date_nate) + +_mssql_date_re = \ + re.compile('(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2}):(\d{2})(\.\d+)?') +def _parse_date_mssql(dateString): + '''Parse a string according to the MS SQL date format''' + m = _mssql_date_re.match(dateString) + if not m: return + w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s:%(second)s%(zonediff)s' % \ + {'year': m.group(1), 'month': m.group(2), 'day': m.group(3),\ + 'hour': m.group(4), 'minute': m.group(5), 'second': m.group(6),\ + 'zonediff': '+09:00'} + if _debug: sys.stderr.write('MS SQL date parsed as: %s\n' % w3dtfdate) + return _parse_date_w3dtf(w3dtfdate) +registerDateHandler(_parse_date_mssql) + +# Unicode strings for Greek date strings +_greek_months = \ + { \ + u'\u0399\u03b1\u03bd': u'Jan', # c9e1ed in iso-8859-7 + u'\u03a6\u03b5\u03b2': u'Feb', # d6e5e2 in iso-8859-7 + u'\u039c\u03ac\u03ce': u'Mar', # ccdcfe in iso-8859-7 + u'\u039c\u03b1\u03ce': u'Mar', # cce1fe in iso-8859-7 + u'\u0391\u03c0\u03c1': u'Apr', # c1f0f1 in iso-8859-7 + u'\u039c\u03ac\u03b9': u'May', # ccdce9 in iso-8859-7 + u'\u039c\u03b1\u03ca': u'May', # cce1fa in iso-8859-7 + u'\u039c\u03b1\u03b9': u'May', # cce1e9 in iso-8859-7 + u'\u0399\u03bf\u03cd\u03bd': u'Jun', # c9effded in iso-8859-7 + u'\u0399\u03bf\u03bd': u'Jun', # c9efed in iso-8859-7 + u'\u0399\u03bf\u03cd\u03bb': u'Jul', # c9effdeb in iso-8859-7 + u'\u0399\u03bf\u03bb': u'Jul', # c9f9eb in iso-8859-7 + u'\u0391\u03cd\u03b3': u'Aug', # c1fde3 in iso-8859-7 + u'\u0391\u03c5\u03b3': u'Aug', # c1f5e3 in iso-8859-7 + u'\u03a3\u03b5\u03c0': u'Sep', # d3e5f0 in iso-8859-7 + u'\u039f\u03ba\u03c4': u'Oct', # cfeaf4 in iso-8859-7 + u'\u039d\u03bf\u03ad': u'Nov', # cdefdd in iso-8859-7 + u'\u039d\u03bf\u03b5': u'Nov', # cdefe5 in iso-8859-7 + u'\u0394\u03b5\u03ba': u'Dec', # c4e5ea in iso-8859-7 + } + +_greek_wdays = \ + { \ + u'\u039a\u03c5\u03c1': u'Sun', # caf5f1 in iso-8859-7 + u'\u0394\u03b5\u03c5': u'Mon', # c4e5f5 in iso-8859-7 + u'\u03a4\u03c1\u03b9': u'Tue', # d4f1e9 in iso-8859-7 + u'\u03a4\u03b5\u03c4': u'Wed', # d4e5f4 in iso-8859-7 + u'\u03a0\u03b5\u03bc': u'Thu', # d0e5ec in iso-8859-7 + u'\u03a0\u03b1\u03c1': u'Fri', # d0e1f1 in iso-8859-7 + u'\u03a3\u03b1\u03b2': u'Sat', # d3e1e2 in iso-8859-7 + } + +_greek_date_format_re = \ + re.compile(u'([^,]+),\s+(\d{2})\s+([^\s]+)\s+(\d{4})\s+(\d{2}):(\d{2}):(\d{2})\s+([^\s]+)') + +def _parse_date_greek(dateString): + '''Parse a string according to a Greek 8-bit date format.''' + m = _greek_date_format_re.match(dateString) + if not m: return + try: + wday = _greek_wdays[m.group(1)] + month = _greek_months[m.group(3)] + except: + return + rfc822date = '%(wday)s, %(day)s %(month)s %(year)s %(hour)s:%(minute)s:%(second)s %(zonediff)s' % \ + {'wday': wday, 'day': m.group(2), 'month': month, 'year': m.group(4),\ + 'hour': m.group(5), 'minute': m.group(6), 'second': m.group(7),\ + 'zonediff': m.group(8)} + if _debug: sys.stderr.write('Greek date parsed as: %s\n' % rfc822date) + return _parse_date_rfc822(rfc822date) +registerDateHandler(_parse_date_greek) + +# Unicode strings for Hungarian date strings +_hungarian_months = \ + { \ + u'janu\u00e1r': u'01', # e1 in iso-8859-2 + u'febru\u00e1ri': u'02', # e1 in iso-8859-2 + u'm\u00e1rcius': u'03', # e1 in iso-8859-2 + u'\u00e1prilis': u'04', # e1 in iso-8859-2 + u'm\u00e1ujus': u'05', # e1 in iso-8859-2 + u'j\u00fanius': u'06', # fa in iso-8859-2 + u'j\u00falius': u'07', # fa in iso-8859-2 + u'augusztus': u'08', + u'szeptember': u'09', + u'okt\u00f3ber': u'10', # f3 in iso-8859-2 + u'november': u'11', + u'december': u'12', + } + +_hungarian_date_format_re = \ + re.compile(u'(\d{4})-([^-]+)-(\d{,2})T(\d{,2}):(\d{2})((\+|-)(\d{,2}:\d{2}))') + +def _parse_date_hungarian(dateString): + '''Parse a string according to a Hungarian 8-bit date format.''' + m = _hungarian_date_format_re.match(dateString) + if not m: return + try: + month = _hungarian_months[m.group(2)] + day = m.group(3) + if len(day) == 1: + day = '0' + day + hour = m.group(4) + if len(hour) == 1: + hour = '0' + hour + except: + return + w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s%(zonediff)s' % \ + {'year': m.group(1), 'month': month, 'day': day,\ + 'hour': hour, 'minute': m.group(5),\ + 'zonediff': m.group(6)} + if _debug: sys.stderr.write('Hungarian date parsed as: %s\n' % w3dtfdate) + return _parse_date_w3dtf(w3dtfdate) +registerDateHandler(_parse_date_hungarian) + +# W3DTF-style date parsing adapted from PyXML xml.utils.iso8601, written by +# Drake and licensed under the Python license. Removed all range checking +# for month, day, hour, minute, and second, since mktime will normalize +# these later +def _parse_date_w3dtf(dateString): + def __extract_date(m): + year = int(m.group('year')) + if year < 100: + year = 100 * int(time.gmtime()[0] / 100) + int(year) + if year < 1000: + return 0, 0, 0 + julian = m.group('julian') + if julian: + julian = int(julian) + month = julian / 30 + 1 + day = julian % 30 + 1 + jday = None + while jday != julian: + t = time.mktime((year, month, day, 0, 0, 0, 0, 0, 0)) + jday = time.gmtime(t)[-2] + diff = abs(jday - julian) + if jday > julian: + if diff < day: + day = day - diff + else: + month = month - 1 + day = 31 + elif jday < julian: + if day + diff < 28: + day = day + diff + else: + month = month + 1 + return year, month, day + month = m.group('month') + day = 1 + if month is None: + month = 1 + else: + month = int(month) + day = m.group('day') + if day: + day = int(day) + else: + day = 1 + return year, month, day + + def __extract_time(m): + if not m: + return 0, 0, 0 + hours = m.group('hours') + if not hours: + return 0, 0, 0 + hours = int(hours) + minutes = int(m.group('minutes')) + seconds = m.group('seconds') + if seconds: + seconds = int(seconds) + else: + seconds = 0 + return hours, minutes, seconds + + def __extract_tzd(m): + '''Return the Time Zone Designator as an offset in seconds from UTC.''' + if not m: + return 0 + tzd = m.group('tzd') + if not tzd: + return 0 + if tzd == 'Z': + return 0 + hours = int(m.group('tzdhours')) + minutes = m.group('tzdminutes') + if minutes: + minutes = int(minutes) + else: + minutes = 0 + offset = (hours*60 + minutes) * 60 + if tzd[0] == '+': + return -offset + return offset + + __date_re = ('(?P\d\d\d\d)' + '(?:(?P-|)' + '(?:(?P\d\d\d)' + '|(?P\d\d)(?:(?P=dsep)(?P\d\d))?))?') + __tzd_re = '(?P[-+](?P\d\d)(?::?(?P\d\d))|Z)' + __tzd_rx = re.compile(__tzd_re) + __time_re = ('(?P\d\d)(?P:|)(?P\d\d)' + '(?:(?P=tsep)(?P\d\d(?:[.,]\d+)?))?' + + __tzd_re) + __datetime_re = '%s(?:T%s)?' % (__date_re, __time_re) + __datetime_rx = re.compile(__datetime_re) + m = __datetime_rx.match(dateString) + if (m is None) or (m.group() != dateString): return + gmt = __extract_date(m) + __extract_time(m) + (0, 0, 0) + if gmt[0] == 0: return + return time.gmtime(time.mktime(gmt) + __extract_tzd(m) - time.timezone) +registerDateHandler(_parse_date_w3dtf) + +def _parse_date_rfc822(dateString): + '''Parse an RFC822, RFC1123, RFC2822, or asctime-style date''' + data = dateString.split() + if data[0][-1] in (',', '.') or data[0].lower() in rfc822._daynames: + del data[0] + if len(data) == 4: + s = data[3] + i = s.find('+') + if i > 0: + data[3:] = [s[:i], s[i+1:]] + else: + data.append('') + dateString = " ".join(data) + if len(data) < 5: + dateString += ' 00:00:00 GMT' + tm = rfc822.parsedate_tz(dateString) + if tm: + return time.gmtime(rfc822.mktime_tz(tm)) +# rfc822.py defines several time zones, but we define some extra ones. +# 'ET' is equivalent to 'EST', etc. +_additional_timezones = {'AT': -400, 'ET': -500, 'CT': -600, 'MT': -700, 'PT': -800} +rfc822._timezones.update(_additional_timezones) +registerDateHandler(_parse_date_rfc822) + +def _parse_date(dateString): + '''Parses a variety of date formats into a 9-tuple in GMT''' + for handler in _date_handlers: + try: + date9tuple = handler(dateString) + if not date9tuple: continue + if len(date9tuple) != 9: + if _debug: sys.stderr.write('date handler function must return 9-tuple\n') + raise ValueError + map(int, date9tuple) + return date9tuple + except Exception, e: + if _debug: sys.stderr.write('%s raised %s\n' % (handler.__name__, repr(e))) + pass + return None + +def _getCharacterEncoding(http_headers, xml_data): + '''Get the character encoding of the XML document + + http_headers is a dictionary + xml_data is a raw string (not Unicode) + + This is so much trickier than it sounds, it's not even funny. + According to RFC 3023 ('XML Media Types'), if the HTTP Content-Type + is application/xml, application/*+xml, + application/xml-external-parsed-entity, or application/xml-dtd, + the encoding given in the charset parameter of the HTTP Content-Type + takes precedence over the encoding given in the XML prefix within the + document, and defaults to 'utf-8' if neither are specified. But, if + the HTTP Content-Type is text/xml, text/*+xml, or + text/xml-external-parsed-entity, the encoding given in the XML prefix + within the document is ALWAYS IGNORED and only the encoding given in + the charset parameter of the HTTP Content-Type header should be + respected, and it defaults to 'us-ascii' if not specified. + + Furthermore, discussion on the atom-syntax mailing list with the + author of RFC 3023 leads me to the conclusion that any document + served with a Content-Type of text/* and no charset parameter + must be treated as us-ascii. (We now do this.) And also that it + must always be flagged as non-well-formed. (We now do this too.) + + If Content-Type is unspecified (input was local file or non-HTTP source) + or unrecognized (server just got it totally wrong), then go by the + encoding given in the XML prefix of the document and default to + 'iso-8859-1' as per the HTTP specification (RFC 2616). + + Then, assuming we didn't find a character encoding in the HTTP headers + (and the HTTP Content-type allowed us to look in the body), we need + to sniff the first few bytes of the XML data and try to determine + whether the encoding is ASCII-compatible. Section F of the XML + specification shows the way here: + http://www.w3.org/TR/REC-xml/#sec-guessing-no-ext-info + + If the sniffed encoding is not ASCII-compatible, we need to make it + ASCII compatible so that we can sniff further into the XML declaration + to find the encoding attribute, which will tell us the true encoding. + + Of course, none of this guarantees that we will be able to parse the + feed in the declared character encoding (assuming it was declared + correctly, which many are not). CJKCodecs and iconv_codec help a lot; + you should definitely install them if you can. + http://cjkpython.i18n.org/ + ''' + + def _parseHTTPContentType(content_type): + '''takes HTTP Content-Type header and returns (content type, charset) + + If no charset is specified, returns (content type, '') + If no content type is specified, returns ('', '') + Both return parameters are guaranteed to be lowercase strings + ''' + content_type = content_type or '' + content_type, params = cgi.parse_header(content_type) + return content_type, params.get('charset', '').replace("'", '') + + sniffed_xml_encoding = '' + xml_encoding = '' + true_encoding = '' + http_content_type, http_encoding = _parseHTTPContentType(http_headers.get('content-type')) + # Must sniff for non-ASCII-compatible character encodings before + # searching for XML declaration. This heuristic is defined in + # section F of the XML specification: + # http://www.w3.org/TR/REC-xml/#sec-guessing-no-ext-info + try: + if xml_data[:4] == '\x4c\x6f\xa7\x94': + # EBCDIC + xml_data = _ebcdic_to_ascii(xml_data) + elif xml_data[:4] == '\x00\x3c\x00\x3f': + # UTF-16BE + sniffed_xml_encoding = 'utf-16be' + xml_data = unicode(xml_data, 'utf-16be').encode('utf-8') + elif (len(xml_data) >= 4) and (xml_data[:2] == '\xfe\xff') and (xml_data[2:4] != '\x00\x00'): + # UTF-16BE with BOM + sniffed_xml_encoding = 'utf-16be' + xml_data = unicode(xml_data[2:], 'utf-16be').encode('utf-8') + elif xml_data[:4] == '\x3c\x00\x3f\x00': + # UTF-16LE + sniffed_xml_encoding = 'utf-16le' + xml_data = unicode(xml_data, 'utf-16le').encode('utf-8') + elif (len(xml_data) >= 4) and (xml_data[:2] == '\xff\xfe') and (xml_data[2:4] != '\x00\x00'): + # UTF-16LE with BOM + sniffed_xml_encoding = 'utf-16le' + xml_data = unicode(xml_data[2:], 'utf-16le').encode('utf-8') + elif xml_data[:4] == '\x00\x00\x00\x3c': + # UTF-32BE + sniffed_xml_encoding = 'utf-32be' + xml_data = unicode(xml_data, 'utf-32be').encode('utf-8') + elif xml_data[:4] == '\x3c\x00\x00\x00': + # UTF-32LE + sniffed_xml_encoding = 'utf-32le' + xml_data = unicode(xml_data, 'utf-32le').encode('utf-8') + elif xml_data[:4] == '\x00\x00\xfe\xff': + # UTF-32BE with BOM + sniffed_xml_encoding = 'utf-32be' + xml_data = unicode(xml_data[4:], 'utf-32be').encode('utf-8') + elif xml_data[:4] == '\xff\xfe\x00\x00': + # UTF-32LE with BOM + sniffed_xml_encoding = 'utf-32le' + xml_data = unicode(xml_data[4:], 'utf-32le').encode('utf-8') + elif xml_data[:3] == '\xef\xbb\xbf': + # UTF-8 with BOM + sniffed_xml_encoding = 'utf-8' + xml_data = unicode(xml_data[3:], 'utf-8').encode('utf-8') + else: + # ASCII-compatible + pass + xml_encoding_match = re.compile('^<\?.*encoding=[\'"](.*?)[\'"].*\?>').match(xml_data) + except: + xml_encoding_match = None + if xml_encoding_match: + xml_encoding = xml_encoding_match.groups()[0].lower() + if sniffed_xml_encoding and (xml_encoding in ('iso-10646-ucs-2', 'ucs-2', 'csunicode', 'iso-10646-ucs-4', 'ucs-4', 'csucs4', 'utf-16', 'utf-32', 'utf_16', 'utf_32', 'utf16', 'u16')): + xml_encoding = sniffed_xml_encoding + acceptable_content_type = 0 + application_content_types = ('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity') + text_content_types = ('text/xml', 'text/xml-external-parsed-entity') + if (http_content_type in application_content_types) or \ + (http_content_type.startswith('application/') and http_content_type.endswith('+xml')): + acceptable_content_type = 1 + true_encoding = http_encoding or xml_encoding or 'utf-8' + elif (http_content_type in text_content_types) or \ + (http_content_type.startswith('text/')) and http_content_type.endswith('+xml'): + acceptable_content_type = 1 + true_encoding = http_encoding or 'us-ascii' + elif http_content_type.startswith('text/'): + true_encoding = http_encoding or 'us-ascii' + elif http_headers and (not http_headers.has_key('content-type')): + true_encoding = xml_encoding or 'iso-8859-1' + else: + true_encoding = xml_encoding or 'utf-8' + return true_encoding, http_encoding, xml_encoding, sniffed_xml_encoding, acceptable_content_type + +def _toUTF8(data, encoding): + '''Changes an XML data stream on the fly to specify a new encoding + + data is a raw sequence of bytes (not Unicode) that is presumed to be in %encoding already + encoding is a string recognized by encodings.aliases + ''' + if _debug: sys.stderr.write('entering _toUTF8, trying encoding %s\n' % encoding) + # strip Byte Order Mark (if present) + if (len(data) >= 4) and (data[:2] == '\xfe\xff') and (data[2:4] != '\x00\x00'): + if _debug: + sys.stderr.write('stripping BOM\n') + if encoding != 'utf-16be': + sys.stderr.write('trying utf-16be instead\n') + encoding = 'utf-16be' + data = data[2:] + elif (len(data) >= 4) and (data[:2] == '\xff\xfe') and (data[2:4] != '\x00\x00'): + if _debug: + sys.stderr.write('stripping BOM\n') + if encoding != 'utf-16le': + sys.stderr.write('trying utf-16le instead\n') + encoding = 'utf-16le' + data = data[2:] + elif data[:3] == '\xef\xbb\xbf': + if _debug: + sys.stderr.write('stripping BOM\n') + if encoding != 'utf-8': + sys.stderr.write('trying utf-8 instead\n') + encoding = 'utf-8' + data = data[3:] + elif data[:4] == '\x00\x00\xfe\xff': + if _debug: + sys.stderr.write('stripping BOM\n') + if encoding != 'utf-32be': + sys.stderr.write('trying utf-32be instead\n') + encoding = 'utf-32be' + data = data[4:] + elif data[:4] == '\xff\xfe\x00\x00': + if _debug: + sys.stderr.write('stripping BOM\n') + if encoding != 'utf-32le': + sys.stderr.write('trying utf-32le instead\n') + encoding = 'utf-32le' + data = data[4:] + newdata = unicode(data, encoding) + if _debug: sys.stderr.write('successfully converted %s data to unicode\n' % encoding) + declmatch = re.compile('^<\?xml[^>]*?>') + newdecl = '''''' + if declmatch.search(newdata): + newdata = declmatch.sub(newdecl, newdata) + else: + newdata = newdecl + u'\n' + newdata + return newdata.encode('utf-8') + +def _stripDoctype(data): + '''Strips DOCTYPE from XML document, returns (rss_version, stripped_data) + + rss_version may be 'rss091n' or None + stripped_data is the same XML document, minus the DOCTYPE + ''' + entity_pattern = re.compile(r']*?)>', re.MULTILINE) + data = entity_pattern.sub('', data) + doctype_pattern = re.compile(r']*?)>', re.MULTILINE) + doctype_results = doctype_pattern.findall(data) + doctype = doctype_results and doctype_results[0] or '' + if doctype.lower().count('netscape'): + version = 'rss091n' + else: + version = None + data = doctype_pattern.sub('', data) + return version, data + +def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, referrer=None, handlers=[]): + '''Parse a feed from a URL, file, stream, or string''' + result = FeedParserDict() + result['feed'] = FeedParserDict() + result['entries'] = [] + if _XML_AVAILABLE: + result['bozo'] = 0 + if type(handlers) == types.InstanceType: + handlers = [handlers] + try: + f = _open_resource(url_file_stream_or_string, etag, modified, agent, referrer, handlers) + data = f.read() + except Exception, e: + result['bozo'] = 1 + result['bozo_exception'] = e + data = '' + f = None + + # if feed is gzip-compressed, decompress it + if f and data and hasattr(f, 'headers'): + if gzip and f.headers.get('content-encoding', '') == 'gzip': + try: + data = gzip.GzipFile(fileobj=_StringIO(data)).read() + except Exception, e: + # Some feeds claim to be gzipped but they're not, so + # we get garbage. Ideally, we should re-request the + # feed without the 'Accept-encoding: gzip' header, + # but we don't. + result['bozo'] = 1 + result['bozo_exception'] = e + data = '' + elif zlib and f.headers.get('content-encoding', '') == 'deflate': + try: + data = zlib.decompress(data, -zlib.MAX_WBITS) + except Exception, e: + result['bozo'] = 1 + result['bozo_exception'] = e + data = '' + + # save HTTP headers + if hasattr(f, 'info'): + info = f.info() + result['etag'] = info.getheader('ETag') + last_modified = info.getheader('Last-Modified') + if last_modified: + result['modified'] = _parse_date(last_modified) + if hasattr(f, 'url'): + result['href'] = f.url + result['status'] = 200 + if hasattr(f, 'status'): + result['status'] = f.status + if hasattr(f, 'headers'): + result['headers'] = f.headers.dict + if hasattr(f, 'close'): + f.close() + + # there are four encodings to keep track of: + # - http_encoding is the encoding declared in the Content-Type HTTP header + # - xml_encoding is the encoding declared in the ; changed +# project name +#2.5 - 7/25/2003 - MAP - changed to Python license (all contributors agree); +# removed unnecessary urllib code -- urllib2 should always be available anyway; +# return actual url, status, and full HTTP headers (as result['url'], +# result['status'], and result['headers']) if parsing a remote feed over HTTP -- +# this should pass all the HTTP tests at ; +# added the latest namespace-of-the-week for RSS 2.0 +#2.5.1 - 7/26/2003 - RMK - clear opener.addheaders so we only send our custom +# User-Agent (otherwise urllib2 sends two, which confuses some servers) +#2.5.2 - 7/28/2003 - MAP - entity-decode inline xml properly; added support for +# inline and as used in some RSS 2.0 feeds +#2.5.3 - 8/6/2003 - TvdV - patch to track whether we're inside an image or +# textInput, and also to return the character encoding (if specified) +#2.6 - 1/1/2004 - MAP - dc:author support (MarekK); fixed bug tracking +# nested divs within content (JohnD); fixed missing sys import (JohanS); +# fixed regular expression to capture XML character encoding (Andrei); +# added support for Atom 0.3-style links; fixed bug with textInput tracking; +# added support for cloud (MartijnP); added support for multiple +# category/dc:subject (MartijnP); normalize content model: 'description' gets +# description (which can come from description, summary, or full content if no +# description), 'content' gets dict of base/language/type/value (which can come +# from content:encoded, xhtml:body, content, or fullitem); +# fixed bug matching arbitrary Userland namespaces; added xml:base and xml:lang +# tracking; fixed bug tracking unknown tags; fixed bug tracking content when +# element is not in default namespace (like Pocketsoap feed); +# resolve relative URLs in link, guid, docs, url, comments, wfw:comment, +# wfw:commentRSS; resolve relative URLs within embedded HTML markup in +# description, xhtml:body, content, content:encoded, title, subtitle, +# summary, info, tagline, and copyright; added support for pingback and +# trackback namespaces +#2.7 - 1/5/2004 - MAP - really added support for trackback and pingback +# namespaces, as opposed to 2.6 when I said I did but didn't really; +# sanitize HTML markup within some elements; added mxTidy support (if +# installed) to tidy HTML markup within some elements; fixed indentation +# bug in _parse_date (FazalM); use socket.setdefaulttimeout if available +# (FazalM); universal date parsing and normalization (FazalM): 'created', modified', +# 'issued' are parsed into 9-tuple date format and stored in 'created_parsed', +# 'modified_parsed', and 'issued_parsed'; 'date' is duplicated in 'modified' +# and vice-versa; 'date_parsed' is duplicated in 'modified_parsed' and vice-versa +#2.7.1 - 1/9/2004 - MAP - fixed bug handling " and '. fixed memory +# leak not closing url opener (JohnD); added dc:publisher support (MarekK); +# added admin:errorReportsTo support (MarekK); Python 2.1 dict support (MarekK) +#2.7.4 - 1/14/2004 - MAP - added workaround for improperly formed
tags in +# encoded HTML (skadz); fixed unicode handling in normalize_attrs (ChrisL); +# fixed relative URI processing for guid (skadz); added ICBM support; added +# base64 support +#2.7.5 - 1/15/2004 - MAP - added workaround for malformed DOCTYPE (seen on many +# blogspot.com sites); added _debug variable +#2.7.6 - 1/16/2004 - MAP - fixed bug with StringIO importing +#3.0b3 - 1/23/2004 - MAP - parse entire feed with real XML parser (if available); +# added several new supported namespaces; fixed bug tracking naked markup in +# description; added support for enclosure; added support for source; re-added +# support for cloud which got dropped somehow; added support for expirationDate +#3.0b4 - 1/26/2004 - MAP - fixed xml:lang inheritance; fixed multiple bugs tracking +# xml:base URI, one for documents that don't define one explicitly and one for +# documents that define an outer and an inner xml:base that goes out of scope +# before the end of the document +#3.0b5 - 1/26/2004 - MAP - fixed bug parsing multiple links at feed level +#3.0b6 - 1/27/2004 - MAP - added feed type and version detection, result['version'] +# will be one of SUPPORTED_VERSIONS.keys() or empty string if unrecognized; +# added support for creativeCommons:license and cc:license; added support for +# full Atom content model in title, tagline, info, copyright, summary; fixed bug +# with gzip encoding (not always telling server we support it when we do) +#3.0b7 - 1/28/2004 - MAP - support Atom-style author element in author_detail +# (dictionary of 'name', 'url', 'email'); map author to author_detail if author +# contains name + email address +#3.0b8 - 1/28/2004 - MAP - added support for contributor +#3.0b9 - 1/29/2004 - MAP - fixed check for presence of dict function; added +# support for summary +#3.0b10 - 1/31/2004 - MAP - incorporated ISO-8601 date parsing routines from +# xml.util.iso8601 +#3.0b11 - 2/2/2004 - MAP - added 'rights' to list of elements that can contain +# dangerous markup; fiddled with decodeEntities (not right); liberalized +# date parsing even further +#3.0b12 - 2/6/2004 - MAP - fiddled with decodeEntities (still not right); +# added support to Atom 0.2 subtitle; added support for Atom content model +# in copyright; better sanitizing of dangerous HTML elements with end tags +# (script, frameset) +#3.0b13 - 2/8/2004 - MAP - better handling of empty HTML tags (br, hr, img, +# etc.) in embedded markup, in either HTML or XHTML form (
,
,
) +#3.0b14 - 2/8/2004 - MAP - fixed CDATA handling in non-wellformed feeds under +# Python 2.1 +#3.0b15 - 2/11/2004 - MAP - fixed bug resolving relative links in wfw:commentRSS; +# fixed bug capturing author and contributor URL; fixed bug resolving relative +# links in author and contributor URL; fixed bug resolvin relative links in +# generator URL; added support for recognizing RSS 1.0; passed Simon Fell's +# namespace tests, and included them permanently in the test suite with his +# permission; fixed namespace handling under Python 2.1 +#3.0b16 - 2/12/2004 - MAP - fixed support for RSS 0.90 (broken in b15) +#3.0b17 - 2/13/2004 - MAP - determine character encoding as per RFC 3023 +#3.0b18 - 2/17/2004 - MAP - always map description to summary_detail (Andrei); +# use libxml2 (if available) +#3.0b19 - 3/15/2004 - MAP - fixed bug exploding author information when author +# name was in parentheses; removed ultra-problematic mxTidy support; patch to +# workaround crash in PyXML/expat when encountering invalid entities +# (MarkMoraes); support for textinput/textInput +#3.0b20 - 4/7/2004 - MAP - added CDF support +#3.0b21 - 4/14/2004 - MAP - added Hot RSS support +#3.0b22 - 4/19/2004 - MAP - changed 'channel' to 'feed', 'item' to 'entries' in +# results dict; changed results dict to allow getting values with results.key +# as well as results[key]; work around embedded illformed HTML with half +# a DOCTYPE; work around malformed Content-Type header; if character encoding +# is wrong, try several common ones before falling back to regexes (if this +# works, bozo_exception is set to CharacterEncodingOverride); fixed character +# encoding issues in BaseHTMLProcessor by tracking encoding and converting +# from Unicode to raw strings before feeding data to sgmllib.SGMLParser; +# convert each value in results to Unicode (if possible), even if using +# regex-based parsing +#3.0b23 - 4/21/2004 - MAP - fixed UnicodeDecodeError for feeds that contain +# high-bit characters in attributes in embedded HTML in description (thanks +# Thijs van de Vossen); moved guid, date, and date_parsed to mapped keys in +# FeedParserDict; tweaked FeedParserDict.has_key to return True if asking +# about a mapped key +#3.0fc1 - 4/23/2004 - MAP - made results.entries[0].links[0] and +# results.entries[0].enclosures[0] into FeedParserDict; fixed typo that could +# cause the same encoding to be tried twice (even if it failed the first time); +# fixed DOCTYPE stripping when DOCTYPE contained entity declarations; +# better textinput and image tracking in illformed RSS 1.0 feeds +#3.0fc2 - 5/10/2004 - MAP - added and passed Sam's amp tests; added and passed +# my blink tag tests +#3.0fc3 - 6/18/2004 - MAP - fixed bug in _changeEncodingDeclaration that +# failed to parse utf-16 encoded feeds; made source into a FeedParserDict; +# duplicate admin:generatorAgent/@rdf:resource in generator_detail.url; +# added support for image; refactored parse() fallback logic to try other +# encodings if SAX parsing fails (previously it would only try other encodings +# if re-encoding failed); remove unichr madness in normalize_attrs now that +# we're properly tracking encoding in and out of BaseHTMLProcessor; set +# feed.language from root-level xml:lang; set entry.id from rdf:about; +# send Accept header +#3.0 - 6/21/2004 - MAP - don't try iso-8859-1 (can't distinguish between +# iso-8859-1 and windows-1252 anyway, and most incorrectly marked feeds are +# windows-1252); fixed regression that could cause the same encoding to be +# tried twice (even if it failed the first time) +#3.0.1 - 6/22/2004 - MAP - default to us-ascii for all text/* content types; +# recover from malformed content-type header parameter with no equals sign +# ('text/xml; charset:iso-8859-1') +#3.1 - 6/28/2004 - MAP - added and passed tests for converting HTML entities +# to Unicode equivalents in illformed feeds (aaronsw); added and +# passed tests for converting character entities to Unicode equivalents +# in illformed feeds (aaronsw); test for valid parsers when setting +# XML_AVAILABLE; make version and encoding available when server returns +# a 304; add handlers parameter to pass arbitrary urllib2 handlers (like +# digest auth or proxy support); add code to parse username/password +# out of url and send as basic authentication; expose downloading-related +# exceptions in bozo_exception (aaronsw); added __contains__ method to +# FeedParserDict (aaronsw); added publisher_detail (aaronsw) +#3.2 - 7/3/2004 - MAP - use cjkcodecs and iconv_codec if available; always +# convert feed to UTF-8 before passing to XML parser; completely revamped +# logic for determining character encoding and attempting XML parsing +# (much faster); increased default timeout to 20 seconds; test for presence +# of Location header on redirects; added tests for many alternate character +# encodings; support various EBCDIC encodings; support UTF-16BE and +# UTF16-LE with or without a BOM; support UTF-8 with a BOM; support +# UTF-32BE and UTF-32LE with or without a BOM; fixed crashing bug if no +# XML parsers are available; added support for 'Content-encoding: deflate'; +# send blank 'Accept-encoding: ' header if neither gzip nor zlib modules +# are available +#3.3 - 7/15/2004 - MAP - optimize EBCDIC to ASCII conversion; fix obscure +# problem tracking xml:base and xml:lang if element declares it, child +# doesn't, first grandchild redeclares it, and second grandchild doesn't; +# refactored date parsing; defined public registerDateHandler so callers +# can add support for additional date formats at runtime; added support +# for OnBlog, Nate, MSSQL, Greek, and Hungarian dates (ytrewq1); added +# zopeCompatibilityHack() which turns FeedParserDict into a regular +# dictionary, required for Zope compatibility, and also makes command- +# line debugging easier because pprint module formats real dictionaries +# better than dictionary-like objects; added NonXMLContentType exception, +# which is stored in bozo_exception when a feed is served with a non-XML +# media type such as 'text/plain'; respect Content-Language as default +# language if not xml:lang is present; cloud dict is now FeedParserDict; +# generator dict is now FeedParserDict; better tracking of xml:lang, +# including support for xml:lang='' to unset the current language; +# recognize RSS 1.0 feeds even when RSS 1.0 namespace is not the default +# namespace; don't overwrite final status on redirects (scenarios: +# redirecting to a URL that returns 304, redirecting to a URL that +# redirects to another URL with a different type of redirect); add +# support for HTTP 303 redirects +#4.0 - MAP - support for relative URIs in xml:base attribute; fixed +# encoding issue with mxTidy (phopkins); preliminary support for RFC 3229; +# support for Atom 1.0; support for iTunes extensions; new 'tags' for +# categories/keywords/etc. as array of dict +# {'term': term, 'scheme': scheme, 'label': label} to match Atom 1.0 +# terminology; parse RFC 822-style dates with no time; lots of other +# bug fixes +#4.1 - MAP - removed socket timeout; added support for chardet library diff -Nru exaile-0.2.11.1/Makefile exaile-0.2.13/Makefile --- exaile-0.2.11.1/Makefile 2007-11-07 11:11:28.000000000 -0500 +++ exaile-0.2.13/Makefile 2008-04-01 21:42:17.000000000 -0400 @@ -1,12 +1,12 @@ PREFIX ?= /usr/local LIBDIR ?= /lib -FIREFOX ?= /usr/lib/firefox all: compile mmkeys.so translations @echo "Done" @echo "Type: 'make install' now" compile: + -bzr version-info --format=python > xl/version.py python -m compileall xl lib python -O -m compileall xl lib @@ -69,13 +69,14 @@ /bin/echo -e \ "#!/bin/sh\n" \ "cd $(PREFIX)/share/exaile\n" \ - "export LD_LIBRARY_PATH=\$$LD_LIBRARY_PATH:$(FIREFOX)\n" \ - "export MOZILLA_FIVE_HOME=$(FIREFOX)\n" \ "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \ > exaile && \ chmod 755 exaile for f in `find po -name exaile.mo` ; do \ - install -D -m 644 $$f \ + install -d -m 755 \ + `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|" | \ + xargs dirname` && \ + install -m 644 $$f \ `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|"` ; \ done @@ -87,7 +88,7 @@ rm -f exaile.glade.h messages.pot plugins/plugins.glade.h tarball: clean - tar --exclude .svn -czvf ../exaile.tar.gz ../exaile + tar --exclude .bzr -czvf ../exaile.tar.gz ../exaile uninstall: rm -rf $(DESTDIR)$(PREFIX)/share/exaile diff -Nru exaile-0.2.11.1/mmkeys/Makefile exaile-0.2.13/mmkeys/Makefile --- exaile-0.2.11.1/mmkeys/Makefile 2007-11-07 11:11:57.000000000 -0500 +++ exaile-0.2.13/mmkeys/Makefile 2008-04-01 21:23:02.000000000 -0400 @@ -10,11 +10,10 @@ mmkeyspy.c: mmkeys.defs mmkeys.override pygtk-codegen-2.0 --prefix mmkeys \ - --register $(DEFS)/gdk-types.defs \ - --register $(DEFS)/gtk-types.defs \ - --override mmkeys.override \ - mmkeys.defs > gen-tmp - mv gen-tmp $@ + --register $(DEFS)/gdk-types.defs \ + --register $(DEFS)/gtk-types.defs \ + --override mmkeys.override \ + mmkeys.defs > $@ clean: rm -f mmkeys.so *.o mmkeyspy.c diff -Nru exaile-0.2.11.1/package.py exaile-0.2.13/package.py --- exaile-0.2.11.1/package.py 2007-11-07 11:11:34.000000000 -0500 +++ exaile-0.2.13/package.py 2008-04-01 21:23:02.000000000 -0400 @@ -32,7 +32,7 @@ os.system('cp -rf ../%s exaile_%s' % (branch, version)) os.chdir('exaile_%s' % version) -for m in ('.pyc', '.pyo', '.svn'): +for m in ('.pyc', '.pyo', '.bzr'): os.system('find . -name %s -exec rm -rf {} \;' % m) os.system('debuild -i -S -sa') diff -Nru exaile-0.2.11.1/plugins/alarmclock.py exaile-0.2.13/plugins/alarmclock.py --- exaile-0.2.11.1/plugins/alarmclock.py 2007-11-07 11:12:01.000000000 -0500 +++ exaile-0.2.13/plugins/alarmclock.py 2008-04-01 21:23:02.000000000 -0400 @@ -16,13 +16,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -import gtk, time, gobject +import gtk, time, gobject, thread from gettext import gettext as _ import xl.plugins as plugins PLUGIN_NAME = _("Alarm Clock") -PLUGIN_AUTHORS = ['Adam Olsen '] -PLUGIN_VERSION = "0.1.2" +PLUGIN_AUTHORS = ['Adam Olsen ', 'Christian Balles '] +PLUGIN_VERSION = "0.2" PLUGIN_DESCRIPTION = _(r"""Plays music at a specific time.\n\nNote that when the specified time arrives, Exaile will just act like you pressed the play button, so be sure you have the music you want to hear in your playlist""") @@ -32,19 +32,125 @@ SETTINGS = None TIMER_ID = None RANG = dict() +APP = None -def configure(): +DAY_ID=0 +DAY_NAME=1 + +days = [ ('1', _('Monday') ), + ('2', _('Tuesday') ), + ('3', _('Wednesday') ), + ('4', _('Thursday') ), + ('5', _('Friday') ), + ('6', _('Saturday') ), + ('0', _('Sunday') ) ] + +check_box_list = [] + +class VolumeControl: + def __init__(self): + self.thread = thread + + def print_debug( self ): + print self.min_volume + print self.max_volume + print self.increment + print self.time_per_inc + + def fade_in( self ): + temp_volume = self.min_volume + while temp_volume <= self.max_volume: + #print "set volume to %s" % str(temp_volume / 100.0) + APP.player.set_volume( ( temp_volume / 100.0 ) ) + temp_volume += self.increment + time.sleep( self.time_per_inc ) + if APP.player.is_paused() or not APP.player.is_playing(): + self.stop_fading() + + + def fade_out( self): + temp_volume = self.max_volume + while temp_volume >= self.min_volume: + #print "set volume to %d" % (temp_volume / 100.0) + APP.player.set_volume( ( temp_volume / 100.0) ) + temp_volume -= self.increment + time.sleep( self.time_per_inc ) + if APP.player.is_paused() or not APP.player.is_playing(): + self.stop_fading() + + def fade_in_thread( self ): + if self.use_fading == "True": + self.thread.start_new( self.fade_in, ()) + + def stop_fading( self ): + self.thread.exit() + + def save_settings( self ): + self.use_fading = str(self.use_button.get_active()) + self.min_volume = self.min_spinBox.get_value() + self.max_volume = self.max_spinBox.get_value() + self.increment = self.inc_spinBox.get_value() + self.time_per_inc = self.time_spinBox.get_value() + APP.settings.set_str("alarm_use_fading", "%s" % self.use_fading, plugin=plugins.name(__file__)) + APP.settings.set_str("alarm_min_volume", "%d" % self.min_volume, plugin=plugins.name(__file__)) + APP.settings.set_str("alarm_max_volume", "%d" % self.max_volume, plugin=plugins.name(__file__)) + APP.settings.set_str("alarm_increment", "%d" % self.increment, plugin=plugins.name(__file__)) + APP.settings.set_str("alarm_time_per_in", "%d" % self.time_per_inc, plugin=plugins.name(__file__)) + + def load_settings( self ): + self.use_fading = APP.settings.get_str("alarm_use_fading", plugin=plugins.name(__file__), default="False") + self.min_volume = int(APP.settings.get_str("alarm_min_volume", plugin=plugins.name(__file__), default="0")) + self.max_volume = int(APP.settings.get_str("alarm_max_volume", plugin=plugins.name(__file__), default="100")) + self.increment = int(APP.settings.get_str("alarm_increment", plugin=plugins.name(__file__), default="1")) + self.time_per_inc = int(APP.settings.get_str("alarm_time_per_inc", plugin=plugins.name(__file__), default="1")) + + def create_vbox( self ): + vbox = gtk.VBox() + + self.use_button = gtk.CheckButton( _( "Use Fading")) + if self.use_fading == "True": + self.use_button.set_active( True) + vbox.pack_start( self.use_button, False, False) + + table = gtk.Table( 4, 2, True) + + table.attach( gtk.Label( _( "Minimum Volume: ")), 0, 1, 0, 1) + self.min_spinBox = gtk.SpinButton( gtk.Adjustment( 1, step_incr=1)) + self.min_spinBox.set_range( 0, 100) + self.min_spinBox.set_value( int(self.min_volume) ) + table.attach( self.min_spinBox, 1,2,0,1) + + table.attach( gtk.Label( _( "Maximum Volume: ")), 0, 1, 1, 2) + self.max_spinBox = gtk.SpinButton( gtk.Adjustment( 1, step_incr=1)) + self.max_spinBox.set_range( 0, 100) + self.max_spinBox.set_value( int(self.max_volume) ) + table.attach( self.max_spinBox, 1,2, 1,2) + + table.attach( gtk.Label( _( "Increment: ")), 0, 1, 2, 3) + self.inc_spinBox = gtk.SpinButton( gtk.Adjustment( 1, step_incr=1)) + self.inc_spinBox.set_range( 1, 100) + self.inc_spinBox.set_value( int(self.increment) ) + table.attach( self.inc_spinBox, 1, 2, 2, 3) + + table.attach( gtk.Label( _( "Time per Inc: ")), 0, 1, 3, 4) + self.time_spinBox = gtk.SpinButton( gtk.Adjustment( 1, step_incr=1)) + self.time_spinBox.set_range( 1, 100) + self.time_spinBox.set_value( int(self.time_per_inc) ) + table.attach( self.time_spinBox, 1, 2, 3, 4) + + vbox.pack_start( table, False, False ) + + return vbox + +VOLUME_CONTROL = VolumeControl() + +def create_alarm_time_hbox( hours = 12, minutes = 30): """ - Configures the time to ring + Creates a GTK-HBox with spinboxes to set the alarm time """ - exaile = APP - alarm_time = exaile.settings.get_str("alarm_time", plugin=plugins.name(__file__), default="12:30") - (hours, minutes) = alarm_time.split(":") - - dialog = plugins.PluginConfigDialog(exaile.window, PLUGIN_NAME) hbox = gtk.HBox() # TRANSLATORS: Alarm time for the Alarm Clock plugin - hbox.pack_start(gtk.Label(_("Alarm Time: ")), False, False) + hbox.pack_start(gtk.Label( _("Alarm Time: ")), False, False) hour = gtk.SpinButton(gtk.Adjustment(1, step_incr=1)) hour.set_range(0, 23) hour.set_value(int(hours)) @@ -54,7 +160,89 @@ minute.set_range(0, 59) minute.set_value(int(minutes)) hbox.pack_start(minute, False, False) - dialog.child.pack_start(hbox, False, False) + return (hbox, hour, minute) + + +def create_alarm_days_vbox( alarm_days ): + """ + create a VBox with GTK-CheckBoxes to choose + the days with alarm + """ + del check_box_list[:] + vbox = gtk.VButtonBox() + + for day in days: + check_box_list.append( gtk.CheckButton( day[DAY_NAME]) ) + if is_day_active( day[DAY_ID], alarm_days) == True: + check_box_list[-1].set_active(True) + + vbox.pack_start( check_box_list[-1] , False, False ) + + return vbox + + +def is_day_active( dayToSet, active_days_list): + """ + is True if the dayToSet is in the activeDayList + """ + for day in active_days_list: + if dayToSet == day: + return True + return False + + +def createDaySettingsString(): + """ + build a string with all the days the alarm is active + """ + checked_days = "" + i = 0 + for check_box in check_box_list: + if check_box.get_active() is True: + checked_days += (days[i])[0] + " " + i += 1 + return checked_days + + +def configure(): + """ + Configures the time to ring + """ + exaile = APP + #get the alarm_time and alarm_days settings + alarm_time = exaile.settings.get_str("alarm_time", plugin=plugins.name(__file__), default="12:30") + alarm_days = exaile.settings.get_str("alarm_days", plugin=plugins.name(__file__), default="" ) + (hours, minutes) = alarm_time.split(":") + alarm_day_list = [] + alarm_day_list = alarm_days.split(" ") + + VOLUME_CONTROL.load_settings() + + dialog = plugins.PluginConfigDialog(exaile.window, PLUGIN_NAME) + + notebook = gtk.Notebook() + + time_and_day_vbox = gtk.VBox() + + alarmTimeTupel = create_alarm_time_hbox( hours, minutes) + time_and_day_vbox.pack_start( alarmTimeTupel[0], False, False) + + hour = alarmTimeTupel[1] + minute = alarmTimeTupel[2] + + + label = gtk.Label( _("Alarm Days:") ) + time_and_day_vbox.pack_start( label, False, False) + + alarmDaysBox = create_alarm_days_vbox( alarm_day_list) + time_and_day_vbox.pack_start( alarmDaysBox, False, False) + + notebook.append_page( time_and_day_vbox, gtk.Label( _("Times")) ) + + notebook.append_page( VOLUME_CONTROL.create_vbox(), gtk.Label( _( "Fading" )) ) + + + dialog.child.pack_start( notebook ); dialog.show_all() result = dialog.run() @@ -65,24 +253,33 @@ minute = minute.get_value() exaile.settings.set_str("alarm_time", "%02d:%02d" % (hour, minute), plugin=plugins.name(__file__)) + exaile.settings.set_str("alarm_days", "%s" % createDaySettingsString(), plugin=plugins.name( __file__) ) + VOLUME_CONTROL.save_settings() def timeout_cb(): """ Called every two seconds. If the plugin is not enabled, it does - nothing. If the current time matches the time specified, it starts - playing + nothing. If the current time matches the time specified and the + current day is selected, it starts playing """ if not PLUGIN_ENABLED: return True + alarm_time = SETTINGS.get_str("alarm_time", plugin=plugins.name(__file__), default="") + alarm_days = SETTINGS.get_str("alarm_days", plugin=plugins.name(__file__), default="") + if not alarm_time: return True + if not alarm_days: return True current = time.strftime("%H:%M", time.localtime()) - if alarm_time == current: + currentDay = time.strftime("%w", time.localtime()) + + if alarm_time == current and is_day_active( currentDay, alarm_days) == True: check = time.strftime("%m %d %Y %H:%M") if RANG.has_key(check): return True track = APP.player.current if track and (APP.player.is_playing() or APP.player.is_paused()): return True - APP.play() + APP.player.play() + VOLUME_CONTROL.fade_in_thread() RANG[check] = True @@ -96,6 +293,7 @@ exaile = APP SETTINGS = exaile.settings TIMER_ID = gobject.timeout_add(2000, timeout_cb) + VOLUME_CONTROL.load_settings() return True def destroy(): diff -Nru exaile-0.2.11.1/plugins/console.py exaile-0.2.13/plugins/console.py --- exaile-0.2.11.1/plugins/console.py 2007-11-07 11:12:02.000000000 -0500 +++ exaile-0.2.13/plugins/console.py 2008-04-01 21:23:02.000000000 -0400 @@ -24,7 +24,7 @@ import gtk PLUGIN_NAME = _("Python Console") -PLUGIN_VERSION = '0.1.1' +PLUGIN_VERSION = '0.1.2' PLUGIN_AUTHORS = ["Johannes Sasongko "] PLUGIN_DESCRIPTION = _(r"""Provides a Python console that can be used to manipulate Exaile.""") @@ -78,20 +78,22 @@ """ Executes some Python code. """ + stdout = sys.stdout try: pycode = compile(code, '', 'single') - stdout = sys.stdout sys.stdout = self.buffer exec pycode in self.dict + except: + sys.stdout = stdout + exc = traceback.format_exception(*sys.exc_info()) + del exc[1] # Remove our function. + result = ''.join(exc) + else: sys.stdout = stdout result = self.buffer.getvalue() # Can't simply close and recreate later because help() stores and # reuses stdout. self.buffer.truncate(0) - except: - exc = traceback.format_exception(*sys.exc_info()) - del exc[1] # Remove our function. - result = ''.join(exc) result = '>>> %s\n%s' % (code, result) self.text_buffer.insert(self.text_buffer.get_end_iter(), result) # Can't use iter, won't scroll correctly. diff -Nru exaile-0.2.11.1/plugins/daap-share/daap-share.py exaile-0.2.13/plugins/daap-share/daap-share.py --- exaile-0.2.11.1/plugins/daap-share/daap-share.py 2007-11-07 11:12:10.000000000 -0500 +++ exaile-0.2.13/plugins/daap-share/daap-share.py 2008-04-01 21:23:02.000000000 -0400 @@ -47,7 +47,7 @@ PLUGIN_NAME = _("Music Sharing") PLUGIN_AUTHORS = ['Aren Olson '] -PLUGIN_VERSION = '0.7.9' +PLUGIN_VERSION = '0.8.1' PLUGIN_DESCRIPTION = _(r"""Allows playing of DAAP music shares. \n\nDepends: python-daap, python-avahi.""") @@ -266,6 +266,8 @@ self.transfer_queue = None self.transferring = False self.queue = None + self.model = gtk.TreeStore(gtk.gdk.Pixbuf, object, str) + self.model_blank = gtk.TreeStore(gtk.gdk.Pixbuf, object, str) self.keyword = None self.track_cache = dict() @@ -282,6 +284,8 @@ xl.path.get_data('images', 'track.png')) self.genre_image = gtk.gdk.pixbuf_new_from_file( xl.path.get_data('images', 'genre.png')) + self.year_image = gtk.gdk.pixbuf_new_from_file(xl.path.get_data( + 'images', 'year.png')) self.setup_widgets() diff -Nru exaile-0.2.11.1/plugins/httpserver/httpserver.py exaile-0.2.13/plugins/httpserver/httpserver.py --- exaile-0.2.11.1/plugins/httpserver/httpserver.py 2007-11-07 11:12:12.000000000 -0500 +++ exaile-0.2.13/plugins/httpserver/httpserver.py 2008-04-01 21:23:02.000000000 -0400 @@ -20,7 +20,7 @@ PLUGIN_NAME = _('HTTP Server Control') PLUGIN_AUTHORS = ['Mathieu Virbel '] -PLUGIN_VERSION = '0.2' +PLUGIN_VERSION = '0.2.2' PLUGIN_DESCRIPTION = _('Open an HTTP Server to control exaile from a remote host') PLUGIN_ENABLED = False button = gtk.Button() @@ -39,49 +39,49 @@ # ----------------------------------------------------------------------------- def tag(tagname, value): - """ - Construct a xml tag - """ - return '<%s>%s' % (tagname, value, tagname) + """ + Construct a xml tag + """ + return '<%s>%s' % (tagname, value, tagname) class TrackInfo: - """ - Fetch some infos from a Track - (In case we have no track, set some default value) - (We also can have reduce information for display a playlist) - """ - - def __init__(self, track = None, playlistmode=False): - self.infos = {} - self.infos['filename'] = '' - self.infos['title'] = _('None') - self.infos['artist'] = _('None') - self.infos['album'] = _('None') - self.infos['bitrate'] = _('None') - self.infos['rating'] = _('Unknown') - self.infos['len'] = '0:00' - self.infos['disc'] = _('None') - self.infos['genre'] = _('None') - self.infos['duration'] = '0' - self.infos['is_paused'] = APP.player.is_paused() - self.infos['is_playing']= APP.player.is_playing() - - if track is not None: - self.infos['filename'] = cgi.escape(track.get_filename()) - self.infos['title'] = cgi.escape(track.get_title()) - self.infos['artist'] = cgi.escape(track.get_artist()) - self.infos['album'] = cgi.escape(track.get_album()) - self.infos['bitrate'] = cgi.escape(track.get_bitrate()) - self.infos['rating'] = cgi.escape(track.get_rating()) - self.infos['len'] = cgi.escape(track.get_len()) - self.infos['disc'] = cgi.escape(track.get_disc()) - self.infos['genre'] = cgi.escape(track.get_genre()) - self.infos['duration'] = cgi.escape(str(track.get_duration())) - - if not playlistmode: - self.infos['position'] = '0' - if track is not None: - self.infos['position'] = cgi.escape(str(APP.player.get_current_position())) + """ + Fetch some infos from a Track + (In case we have no track, set some default value) + (We also can have reduce information for display a playlist) + """ + + def __init__(self, track = None, playlistmode=False): + self.infos = {} + self.infos['filename'] = '' + self.infos['title'] = _('None') + self.infos['artist'] = _('None') + self.infos['album'] = _('None') + self.infos['bitrate'] = _('None') + self.infos['rating'] = _('Unknown') + self.infos['len'] = '0:00' + self.infos['disc'] = _('None') + self.infos['genre'] = _('None') + self.infos['duration'] = '0' + self.infos['is_paused'] = APP.player.is_paused() + self.infos['is_playing']= APP.player.is_playing() + + if track is not None: + self.infos['filename'] = cgi.escape(track.get_filename()) + self.infos['title'] = cgi.escape(track.get_title()) + self.infos['artist'] = cgi.escape(track.get_artist()) + self.infos['album'] = cgi.escape(track.get_album()) + self.infos['bitrate'] = cgi.escape(track.get_bitrate()) + self.infos['rating'] = cgi.escape(track.get_rating()) + self.infos['len'] = cgi.escape(track.get_len()) + self.infos['disc'] = cgi.escape(track.get_disc()) + self.infos['genre'] = cgi.escape(track.get_genre()) + self.infos['duration'] = cgi.escape(str(track.get_duration())) + + if not playlistmode: + self.infos['position'] = '0' + if track is not None: + self.infos['position'] = cgi.escape(str(APP.player.get_current_position())) @@ -90,137 +90,137 @@ # ----------------------------------------------------------------------------- def eh_page_rpc_current(r): - """ - Get informations from current track - Response is in XML. - """ - r.send_response(200, 'OK') - r.send_header('Pragma', 'no-cache') - r.send_header('Content-type', 'text/xml; charset=utf-8') - r.end_headers() - - ti = TrackInfo(APP.player.current) - r.wfile.write('') - r.wfile.write('') - for key in ti.infos: - r.wfile.write(tag(key, ti.infos[key])) - r.wfile.write('') + """ + Get informations from current track + Response is in XML. + """ + r.send_response(200, 'OK') + r.send_header('Pragma', 'no-cache') + r.send_header('Content-type', 'text/xml; charset=utf-8') + r.end_headers() + + ti = TrackInfo(APP.player.current) + r.wfile.write('') + r.wfile.write('') + for key in ti.infos: + r.wfile.write(tag(key, ti.infos[key])) + r.wfile.write('') def eh_page_cover_current(r): - """ - Return the current track cover in a HTTP Response - Support only jpeg or png file - """ - track = APP.player.current - if track is None: - r.send_error(404,'Not Found') - return - filename = APP.cover_manager.fetch_cover(track, 1) - if filename is None or filename == '': - r.send_error(404, 'Not Found') - return - - handle = open(filename, 'rb') - if handle is None: - self.send_error(404, 'Not Found') - return - - r.send_response(200, 'OK') - r.send_header('Pragma', 'no-cache') - if filename.rfind('.jpg') > 0: - r.send_header('Content-type', 'image/jpeg') - else: - r.send_header('Content-type', 'image/png') - r.end_headers() + """ + Return the current track cover in a HTTP Response + Support only jpeg or png file + """ + track = APP.player.current + if track is None: + r.send_error(404,'Not Found') + return + filename = APP.cover_manager.fetch_cover(track, 1) + if filename is None or filename == '': + r.send_error(404, 'Not Found') + return + + handle = open(filename, 'rb') + if handle is None: + self.send_error(404, 'Not Found') + return + + r.send_response(200, 'OK') + r.send_header('Pragma', 'no-cache') + if filename.rfind('.jpg') > 0: + r.send_header('Content-type', 'image/jpeg') + else: + r.send_header('Content-type', 'image/png') + r.end_headers() - data = handle.read() - handle.close() + data = handle.read() + handle.close() - r.wfile.write(data) + r.wfile.write(data) def eh_page_file(r): - """ - Return a static file from zipfile - Filter is done before. - """ - r.send_response(200, 'OK') - r.send_header('Pragma', 'no-cache') - if r.path.rfind('.css') > 0: - r.send_header('Content-type', 'text/css') - else: - r.send_header('Content-type', 'text/html; charset=utf-8') - r.end_headers() - - path = r.path - if path == '/': - path = '/index.html' + """ + Return a static file from zipfile + Filter is done before. + """ + r.send_response(200, 'OK') + r.send_header('Pragma', 'no-cache') + if r.path.rfind('.css') > 0: + r.send_header('Content-type', 'text/css') + else: + r.send_header('Content-type', 'text/html; charset=utf-8') + r.end_headers() + + path = r.path + if path == '/': + path = '/index.html' - data = ZIP.get_data('data%s' % path) - r.wfile.write(data) + data = ZIP.get_data('data%s' % path) + r.wfile.write(data) def eh_page_rpc_action(r): - """ - Handle some player action (play, next, pause...) - """ - r.send_response(200, 'OK') - r.send_header('Pragma', 'no-cache') - r.send_header('Content-type', 'text/plain') - r.end_headers() - r.wfile.write('OK') - - paths = r.path.split('?') - path = paths[0] - if path == '/rpc/action/play': - if len(paths) > 1: - args = cgi.parse_qs(paths[1]) - if args.has_key('f') and args['f'] != '' and APP.tracks is not None: - songs = APP.tracks.get_songs() - for track in songs: - if track.get_filename() == args['f'][0]: - print 'PLAYING filename=%s' % args['f'][0] - gobject.idle_add(APP.player.play_track, track, False, False) - return; - if APP.player.is_paused(): - gobject.idle_add(APP.player.toggle_pause) - else: - gobject.idle_add(APP.player.play) - elif path == '/rpc/action/next': - gobject.idle_add(APP.player.next) - elif path == '/rpc/action/previous': - gobject.idle_add(APP.player.previous) - elif path == '/rpc/action/pause': - gobject.idle_add(APP.player.pause) - elif path == '/rpc/action/stop': - gobject.idle_add(APP.player.stop) - elif path == '/rpc/action/seek': - args = cgi.parse_qs(paths[1]) - if args.has_key('s') and args['s'] != '': - gobject.idle_add(APP.player.seek, int(args['s'][0]), False) + """ + Handle some player action (play, next, pause...) + """ + r.send_response(200, 'OK') + r.send_header('Pragma', 'no-cache') + r.send_header('Content-type', 'text/plain') + r.end_headers() + r.wfile.write('OK') + + paths = r.path.split('?') + path = paths[0] + if path == '/rpc/action/play': + if len(paths) > 1: + args = cgi.parse_qs(paths[1]) + if args.has_key('f') and args['f'] != '' and APP.tracks is not None: + songs = APP.tracks.get_songs() + for track in songs: + if track.get_filename() == args['f'][0]: + print 'PLAYING filename=%s' % args['f'][0] + gobject.idle_add(APP.player.play_track, track, False, False) + return; + if APP.player.is_paused(): + gobject.idle_add(APP.player.toggle_pause) + else: + gobject.idle_add(APP.player.play) + elif path == '/rpc/action/next': + gobject.idle_add(APP.player.next) + elif path == '/rpc/action/previous': + gobject.idle_add(APP.player.previous) + elif path == '/rpc/action/pause': + gobject.idle_add(APP.player.pause) + elif path == '/rpc/action/stop': + gobject.idle_add(APP.player.stop) + elif path == '/rpc/action/seek': + args = cgi.parse_qs(paths[1]) + if args.has_key('s') and args['s'] != '': + gobject.idle_add(APP.player.seek, int(args['s'][0]), False) def eh_page_playlist_list(r): - """ - Return track informations from current playlist - """ - r.send_response(200, 'OK') - r.send_header('Pragma', 'no-cache') - r.send_header('Content-type', 'text/xml; charset=utf-8') - r.end_headers() - - r.wfile.write('') - r.wfile.write('') - if APP.tracks is not None: - songs = APP.tracks.get_songs() - for song in songs: - ti = TrackInfo(song, playlistmode=True) - r.wfile.write('') - for key in ti.infos: - r.wfile.write(tag(key, ti.infos[key])) - r.wfile.write('') - r.wfile.write('') + """ + Return track informations from current playlist + """ + r.send_response(200, 'OK') + r.send_header('Pragma', 'no-cache') + r.send_header('Content-type', 'text/xml; charset=utf-8') + r.end_headers() + + r.wfile.write('') + r.wfile.write('') + if APP.tracks is not None: + songs = APP.tracks.get_songs() + for song in songs: + ti = TrackInfo(song, playlistmode=True) + r.wfile.write('') + for key in ti.infos: + r.wfile.write(tag(key, ti.infos[key])) + r.wfile.write('') + r.wfile.write('') @@ -229,61 +229,61 @@ # ----------------------------------------------------------------------------- eh_pages = { - # Dynamic content - '/image/cover/current': eh_page_cover_current, + # Dynamic content + '/image/cover/current': eh_page_cover_current, - # RPC url - '/rpc/current': eh_page_rpc_current, - '/rpc/action/play': eh_page_rpc_action, - '/rpc/action/stop': eh_page_rpc_action, - '/rpc/action/next': eh_page_rpc_action, - '/rpc/action/previous': eh_page_rpc_action, - '/rpc/action/pause': eh_page_rpc_action, - '/rpc/action/seek': eh_page_rpc_action, - '/rpc/playlist/list': eh_page_playlist_list, - - # Data - '/': eh_page_file, - '/index.html': eh_page_file, - '/exaile.css': eh_page_file, - '/exaile.js': eh_page_file, - '/prototype.js': eh_page_file, - '/btn-play.png': eh_page_file, - '/btn-stop.png': eh_page_file, - '/btn-pause.png': eh_page_file, - '/btn-previous.png': eh_page_file, - '/btn-next.png': eh_page_file, - '/btn-reload.png': eh_page_file, - '/star.png': eh_page_file, - '/loading.gif': eh_page_file, - '/bg-trans.png': eh_page_file, - } + # RPC url + '/rpc/current': eh_page_rpc_current, + '/rpc/action/play': eh_page_rpc_action, + '/rpc/action/stop': eh_page_rpc_action, + '/rpc/action/next': eh_page_rpc_action, + '/rpc/action/previous': eh_page_rpc_action, + '/rpc/action/pause': eh_page_rpc_action, + '/rpc/action/seek': eh_page_rpc_action, + '/rpc/playlist/list': eh_page_playlist_list, + + # Data + '/': eh_page_file, + '/index.html': eh_page_file, + '/exaile.css': eh_page_file, + '/exaile.js': eh_page_file, + '/prototype.js': eh_page_file, + '/btn-play.png': eh_page_file, + '/btn-stop.png': eh_page_file, + '/btn-pause.png': eh_page_file, + '/btn-previous.png': eh_page_file, + '/btn-next.png': eh_page_file, + '/btn-reload.png': eh_page_file, + '/star.png': eh_page_file, + '/loading.gif': eh_page_file, + '/bg-trans.png': eh_page_file, + } class ExaileHttpRequestHandler(BaseHTTPRequestHandler): - def do_GET(self): + def do_GET(self): - path = self.path.split('?')[0] - if eh_pages.has_key(path): - eh_pages[path](self) - else: - self.send_error(404,'Not Found') - return - - return - - @staticmethod - def serve_forever(port): - HTTPServer(('', port), ExaileHttpRequestHandler).serve_forever() + path = self.path.split('?')[0] + if eh_pages.has_key(path): + eh_pages[path](self) + else: + self.send_error(404,'Not Found') + return + + return + + @staticmethod + def serve_forever(port): + HTTPServer(('', port), ExaileHttpRequestHandler).serve_forever() class ExaileHttpThread(threading.Thread): - def __init__(self): - threading.Thread.__init__(self) + def __init__(self): + threading.Thread.__init__(self) - def run(self): - print 'HTTP> http://127.0.0.1:%d/' % DEFAULT_PORT - ExaileHttpRequestHandler.serve_forever(DEFAULT_PORT) + def run(self): + print 'HTTP> http://127.0.0.1:%d/' % DEFAULT_PORT + ExaileHttpRequestHandler.serve_forever(DEFAULT_PORT) @@ -292,12 +292,14 @@ # ----------------------------------------------------------------------------- def initialize(): - eh_thread = ExaileHttpThread() - eh_thread.setDaemon(True) - eh_thread.start() - return True + global eh_thread + eh_thread = ExaileHttpThread() + eh_thread.setDaemon(True) + eh_thread.start() + return True def destroy(): - if eh_thread is not None: - del eh_thread - eh_thread = None + global eh_thread + if eh_thread is not None: + del eh_thread + eh_thread = None diff -Nru exaile-0.2.11.1/plugins/icastplugin/gui.glade exaile-0.2.13/plugins/icastplugin/gui.glade --- exaile-0.2.11.1/plugins/icastplugin/gui.glade 2007-11-07 11:12:19.000000000 -0500 +++ exaile-0.2.13/plugins/icastplugin/gui.glade 2008-04-01 21:23:02.000000000 -0400 @@ -764,8 +764,7 @@ 140 True http -icy -xaudiocast + icy False True diff -Nru exaile-0.2.11.1/plugins/icastplugin/icastplugin.py exaile-0.2.13/plugins/icastplugin/icastplugin.py --- exaile-0.2.11.1/plugins/icastplugin/icastplugin.py 2007-11-07 11:12:20.000000000 -0500 +++ exaile-0.2.13/plugins/icastplugin/icastplugin.py 2008-04-01 21:23:02.000000000 -0400 @@ -289,7 +289,7 @@ """ Send data to the server """ - buf = f.read(4096) + buf = f.read(4096*4) if len(buf) == 0: self.client.log("Done sending '%s'" \ % self.current_track) @@ -299,10 +299,11 @@ except shout.ShoutException: self.disconnect() return False - self._server.sync() + delay = self._server.delay()/1000.0 + if delay > 0: time.sleep(delay) return True - def _update_info(self, f): + def _change_data(self, f=None): """ Update info for data to be streamed """ @@ -343,12 +344,11 @@ """ Main Icast method, loops forever """ - change_data = False - streaming = False connect_retry = False retry_delay = 3 #seconds f = None done = False + sleep_delay = 0.01 while self.keep_alive: if self.client.is_playing() \ and not done: @@ -358,56 +358,38 @@ # Something happened, maybe just give the server some time to settle down time.sleep(retry_delay) connect_retry = False - # TODO handle exceptions properly try: self.connect() except Exception: - change_data = False self.client.log("Connection retry count: 1") connect_retry = True else: - change_data = True - if change_data: - # Update information - f = self._update_info(f) - if not f: + f = self._change_data() + # Send data (and only do that! don't close the file!) + elif not self._send_data(f): + # If done sending data, request another track + f = self._change_data(f) + if not f: self.client.log("Finished sending data") self._close_stream() done = True - else: - streaming = True - change_data = False - if streaming: - # Send data (and only do that! don't close the file!) - streaming = self._send_data(f) - if not streaming: - # If sending data is done, send another track - change_data = True - # TODO if someone wants to stream the same song twice (why would you freak?) this won't work -# if self.current_track != \ -# self.client.get_current_track(): - # Song changed -# change_data = True # if not playing - elif done and not self.client.is_playing(): + if done and not self.client.is_playing(): done = False - elif self.connected: + elif self.connected and False: # if client stopped, disconnect from server # TODO how can we avoid this? we are suppose to only disconnect, not check if it's playing or not - time.sleep(0.5) if not self.client.is_playing(): self._close_stream(f) - change_data = False - if done: done = False - time.sleep(0.01) - print "bye bye" - + else: + time.sleep(sleep_delay) + # ----------------------------------------------------------------------------------------------------------------# # Plugin code starts here. START HERE IF YOU NEED TO CHANGE ANY OPTION PLUGIN_NAME = _("Icast Streamer") PLUGIN_AUTHORS = ['Edgar Merino '] -PLUGIN_VERSION = "0.5.2" +PLUGIN_VERSION = "0.5.4" __version = PLUGIN_VERSION PLUGIN_DESCRIPTION = _(r"""Stream to an icecast/shoutcast server""") PLUGIN_ENABLED = False @@ -432,10 +414,11 @@ return self.current_track.io_loc def get_next_track(self): - self.current_track = self.app.tracks.get_next_track(self.current_track) - if not self.current_track: - if not self.app.player.current: return None + if not self.current_track: self.current_track = self.app.player.current + else: + self.current_track = self.app.tracks.get_next_track(self.current_track) + if not self.current_track: return None return self.current_track.io_loc def get_track_metadata(self): diff -Nru exaile-0.2.11.1/plugins/ipoddriver.py exaile-0.2.13/plugins/ipoddriver.py --- exaile-0.2.11.1/plugins/ipoddriver.py 2007-11-07 11:12:05.000000000 -0500 +++ exaile-0.2.13/plugins/ipoddriver.py 2008-04-01 21:23:02.000000000 -0400 @@ -1,4 +1,4 @@ -#d!/usr/bin/env python +#!/usr/bin/env python # Copyright (C) 2006 Adam Olsen # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,10 @@ PLUGIN_NAME = _("iPod Device Driver") PLUGIN_AUTHORS = ['Adam Olsen '] PLUGIN_VERSION = '0.4.6' -PLUGIN_DESCRIPTION = _(r"""iPod Driver for the Devices Panel""") +PLUGIN_DESCRIPTION = _(r"""iPod Driver for the Devices Panel +\n\nRequires libgpod and its Python bindings to be installed +\n(e.g. python-gpod in Debian).""") + PLUGIN_ENABLED = False button = gtk.Button() PLUGIN_ICON = button.render_icon('gnome-dev-ipod', gtk.ICON_SIZE_MENU) diff -Nru exaile-0.2.11.1/plugins/minimode.py exaile-0.2.13/plugins/minimode.py --- exaile-0.2.11.1/plugins/minimode.py 2007-11-07 11:12:05.000000000 -0500 +++ exaile-0.2.13/plugins/minimode.py 2008-04-01 21:23:02.000000000 -0400 @@ -15,14 +15,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import gtk, gobject, pango +import gtk, gobject, pango, gst from gettext import gettext as _ from xl import xlmisc import xl.plugins as plugins PLUGIN_NAME = _("Mini Mode") PLUGIN_AUTHORS = ['Adam Olsen '] -PLUGIN_VERSION = '0.4.6' +PLUGIN_VERSION = '0.4.8' PLUGIN_DESCRIPTION = _(r"""Super groovy mini mode window!\n\nMini Mode is activated by pressing CTRL+ALT+M\n\nYou can move the window in most cases by ALT+drag""") @@ -62,14 +62,14 @@ box = dialog.main on_top = settings.get_boolean('on_top', plugin=plugins.name(__file__), default=False) - no_taskbar = settings.get_boolean('no_taskbar', - plugin=plugins.name(__file__), default=False) + taskbar = settings.get_boolean('taskbar', + plugin=plugins.name(__file__), default=True) decoration = settings.get_boolean('decoration', plugin=plugins.name(__file__), default=False) font_size = settings.get_int('font_size', plugin=plugins.name(__file__), default=8) on_top_box = gtk.CheckButton(_('Always on top')) - no_taskbar_box = gtk.CheckButton(_('Skip taskbar')) + taskbar_box = gtk.CheckButton(_('Show in taskbar')) decoration_box = gtk.CheckButton(_('Window decoration')) font_size_label = gtk.Label(_('Tracklist font size:')) @@ -82,11 +82,11 @@ font_size_box.pack_start(font_size_spinner) on_top_box.set_active(on_top) - no_taskbar_box.set_active(no_taskbar) + taskbar_box.set_active(taskbar) decoration_box.set_active(decoration) box.pack_start(on_top_box) - box.pack_start(no_taskbar_box) + box.pack_start(taskbar_box) box.pack_start(decoration_box) box.pack_start(font_size_box) dialog.show_all() @@ -96,7 +96,7 @@ if not result == gtk.RESPONSE_OK: return settings.set_boolean('on_top', on_top_box.get_active(), plugin=plugins.name(__file__)) - settings.set_boolean('no_taskbar', no_taskbar_box.get_active(), plugin=plugins.name(__file__)) + settings.set_boolean('taskbar', taskbar_box.get_active(), plugin=plugins.name(__file__)) settings.set_boolean('decoration', decoration_box.get_active(), plugin=plugins.name(__file__)) settings.set_int('font_size', font_size_spinner.get_value_as_int(), plugin=plugins.name(__file__)) @@ -150,16 +150,30 @@ self.title_box.connect('changed', self.change_track) bbox.pack_start(self.title_box, False) - self.seeker = gtk.HScale(gtk.Adjustment(0, 0, 100, 1, 5, 0)) - self.seeker.set_draw_value(False) - self.seeker.set_size_request(150, -1) - self.seeker_id = self.seeker.connect('change-value', self.seek) - bbox.pack_start(self.seeker, False) - - self.pos_label = gtk.Label("0:00") - self.pos_label.set_size_request(40, -1) - self.pos_label.set_alignment(0.0, .5) - bbox.pack_start(self.pos_label) + self.progressbar = gtk.ProgressBar() + self.progressbar.set_fraction(0) + self.progressbar.set_size_request(200, -1) + self.progressbar.set_text(APP.new_progressbar.get_text()) + self.progressbar.props.events = gtk.gdk.BUTTON_MOTION_MASK | \ + gtk.gdk.BUTTON_PRESS_MASK | \ + gtk.gdk.BUTTON_RELEASE_MASK + self.progressbar.connect('button-press-event', self.seek_begin) + self.progressbar.connect('button-release-event', self.seek_end) + self.progressbar.connect('motion-notify-event', self.seek_motion_notify) + + self.progressbar.set_size_request(-1, 24) + + pbox = gtk.VBox() + label_sizes = 2 + l = gtk.Label() + l.set_size_request(-1, label_sizes) + pbox.pack_start(l, False, False) + pbox.pack_start(self.progressbar, True, True) + l = gtk.Label() + l.set_size_request(-1, label_sizes) + pbox.pack_start(l, False, False) + + bbox.pack_start(pbox, False) mm = self.create_button('gtk-fullscreen', toggle_minimode, _('Restore' ' Regular View')) @@ -172,27 +186,68 @@ self.connect('configure-event', self.on_move) self.first = False - def seek(self, range, scroll, value): + def seek_begin(self, widget, event): """ - Seeks in the current track + Starts when seek drag begins """ + if not APP.player.current or \ + APP.player.current.type == 'stream': return + self.seeking = True - if self.seek_id: - gobject.source_remove(self.seek_id) - self.seeking = False - self.seek_id = None + def seek_motion_notify(self, widget, event): + """ + Simulates dragging on the new progressbar widget + """ + if not APP.player.current or APP.player.current.type == \ + 'stream': return + mouse_x, mouse_y = event.get_coords() + progress_loc = self.progressbar.get_allocation() + + value = mouse_x / progress_loc.width + if value < 0: value = 0 + if value > 1: value = 1 + self.progressbar.set_fraction(value) + track = APP.player.current - self.seek_id = gobject.timeout_add(250, self._seek_cb, range) - self.seeking = True + duration = track.duration + if duration == -1: + real = 0 + else: + real = value * duration + seconds = real - def _seek_cb(self, range): + remaining_seconds = duration - seconds + self.progressbar.set_text("%d:%02d / %d:%02d" % ((seconds / 60), + (seconds % 60), (remaining_seconds / 60), (remaining_seconds % 60))) + + def seek_end(self, widget, event): + """ + Resets seeking flag, actually seeks to the requested location + """ + mouse_x, mouse_y = event.get_coords() + progress_loc = self.progressbar.get_allocation() + + value = mouse_x / progress_loc.width + if value < 0: value = 0 + if value > 1: value = 1 + + if not APP.player.current or \ + APP.player.current.type == 'stream': + self.progressbar.set_fraction(0) + return + duration = APP.player.current.duration * gst.SECOND + if duration == -1: + real = 0 + else: + real = value * duration / 100 + seconds = real / gst.SECOND duration = APP.player.current.duration - real = long(range.get_value() * duration / 100) + real = float(value * duration) APP.player.seek(real) + self.seeking = False APP.player.current.submitted = True APP.emit('seek', real) - self.seeking = False def change_track(self, combo): """ @@ -201,7 +256,7 @@ iter = self.title_box.get_active_iter() if iter: song = self.model.get_value(iter, 1) - APP.stop() + APP.player.stop() APP.player.play_track(song) def setup_title_box(self): @@ -291,11 +346,11 @@ else: self.set_keep_above(False) - if APP.settings.get_boolean('no_taskbar', - plugin=plugins.name(__file__), default=False): - self.set_property('skip-taskbar-hint', True) - else: + if APP.settings.get_boolean('taskbar', + plugin=plugins.name(__file__), default=True): self.set_property('skip-taskbar-hint', False) + else: + self.set_property('skip-taskbar-hint', True) if APP.settings.get_boolean('decoration', plugin=plugins.name(__file__), default=False): @@ -368,12 +423,8 @@ self.set_title(APP.window.get_title()) def timeout_cb(self): - text = APP.new_progressbar.get_text() - b = text.find(' /') - if b > -1: - text = text[:b] - self.pos_label.set_label(text) - self.seeker.set_value(APP.new_progressbar.get_fraction() * 100) + self.progressbar.set_text(APP.new_progressbar.get_text()) + self.progressbar.set_fraction(APP.new_progressbar.get_fraction()) return True diff -Nru exaile-0.2.11.1/plugins/mtpdevice.py exaile-0.2.13/plugins/mtpdevice.py --- exaile-0.2.11.1/plugins/mtpdevice.py 1969-12-31 19:00:00.000000000 -0500 +++ exaile-0.2.13/plugins/mtpdevice.py 2008-04-01 21:23:02.000000000 -0400 @@ -0,0 +1,360 @@ +#!/usr/bin/env python +# Copyright (C) 2007 Dan O'Reilly + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 1, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +import gobject +import gtk +from xl import common, media, library, plugins, xlmisc +from gettext import gettext as _ +from xl.panels import collection +import xl.path + + +PLUGIN_NAME = "MTP Device Manager" +PLUGIN_AUTHORS = ["Dan O'Reilly "] +PLUGIN_VERSION = "0.4.0" +PLUGIN_DESCRIPTION = _(r"""MTP device manager. +\n\nDepends: +\nlibmtp: http://libmtp.sourceforge.net/ +\npymtp: http://nick125.com/projects/pymtp/""") +PLUGIN_ENABLED = False +PLUGIN_ICON = None + +try: + import pymtp + MTP_INSTALLED = True +except: + MTP_INSTALLED = False + +CONNS = plugins.SignalContainer() + + +class MTPTrack(media.Track): + ''' + MTPTrack class for holding media.Track info, the LIBMTP_Track + item_id, and identifying the track type as 'device' so things get + handled correctly by exaile. + ''' + type = 'device' + + def __init__(self, title_t, artist_t, album_t, track_t, year_t, length_t, genre_t): + ''' + Initializes a media.Track type with the necessary metadata + ''' + media.Track.__init__(self, title=title_t, artist=artist_t, album=album_t, + genre=genre_t, track=track_t, year=year_t, length=length_t) + self.type = 'device' + mtp_item_id = None + + +class MTPPlaylist(object): + """ + Container for MTP Playlist + """ + + def __init__(self, playlist, root=False): + self.playlist = playlist + self.root = root + self.name = playlist.name + self.tracks = playlist.tracks + self.no_tracks = playlist.no_tracks + self.playlist_id = playlist.playlist_id + + def __str__(self): + return self.name + + +class MTPDeviceDriver(plugins.DeviceDriver): + ''' + Class that implements an MTP Device Driver + ''' + name = 'mtpdevice' + + def __init__(self): + """ + Initializes the MTPDeviceDriver class. + """ + plugins.DeviceDriver.__init__(self) + self.connected = False + self.connecting = False + self.exaile = APP + self.dp = APP.device_panel + self.mtp_image = xlmisc.get_icon('gnome-dev-ipod') + self.track_image = gtk.gdk.pixbuf_new_from_file(xl.path.get_data( + 'images', 'track.png')) + self.playlist_image = gtk.gdk.pixbuf_new_from_file(xl.path.get_data( + 'images', 'playlist.png')) + self.directory_image = xlmisc.get_icon('gnome-fs-directory') + + + @common.threaded + def connect(self, panel): + ''' + Connects to the MTP device and loads playlist/track + info into exaile. + ''' + if self.connecting: self.disconnect() + + self.connecting = True + self.panel = panel + self.collection_panel = self.exaile.collection_panel + self.mtp = pymtp.MTP() + try: + self.mtp.connect() + self.connected = True + except: + self.panel.on_connect_complete(None) + gobject.idle_add(panel.on_error, _("Couldn't connect to the MTP device," + " wait a few seconds or reconnect the" + " device, then try again.")) + self.connected = False + self.connecting = False + return + + self.panel.track_count.set_label(_("Loading tracks...")) + tracks = self.mtp.get_tracklisting() + gobject.idle_add(self._load_tracks, tracks) + + self.panel.track_count.set_label(_("Loading playlists...")) + self.playlists = {} + for playlist in self.mtp.get_playlists(): + p_entry = MTPPlaylist(playlist) + self.playlists[p_entry] = [] + for track in playlist.__iter__(): + self.playlists[p_entry].append(track) + + self.panel.track_count.set_label(_("Loading folders...")) + + self.connecting = False + + + def _load_tracks(self, track_list): + ''' + Loads the tracks from the connected device into the device panel + ''' + self.all = library.TrackData() + self.all_dict = {} + for t in list(track_list): + song = MTPTrack(t.title, t.artist, t.album, t.tracknumber, + t.date, t.duration/1000, t.genre) + song.mtp_item_id = t.item_id + # Since MTP tracks don't have an actual path, we use the + # unique item_id the MTP player assigns it, so that exaile + # has a way to hunt down the track from the panel tree. + song.loc = str(t.item_id) + gobject.idle_add(self.all.append, song) + self.all_dict[t.item_id] = song + self.connected = True + gobject.idle_add(self.panel.on_connect_complete, self) + + + def get_menu(self, item, menu): + return menu + + + def get_initial_root(self, model): + """ + Adds new nodes and returns the one tracks should be added to + """ + if not self.playlists: return None + self.mtproot = model.append(None, [self.directory_image, _("Playlists"), + 'nofield']) + + for k, v in self.playlists.iteritems(): + item = model.append(self.mtproot, [self.playlist_image, k, + 'nofield']) + self.load_playlist(item, v, model) + new_root = model.append(None, [self.mtp_image, _("Music Collection"), + 'nofield']) + return new_root + + + def load_playlist(self, parent, list_contents, model): + """ + Adds the track list for a given playlist to the device panel + in Artst - Title format. + """ + for track_id in list_contents: + song = self.all_dict[track_id] + if not song: + print 'Couldn\'t find playlist track on device' + continue + name = song.artist + " - " + song.title + model.append(parent, [self.track_image, name, 'nofield']) + + + def done_loading_tree(self): + """ + Called when the tree is done loading + """ + path = self.dp.model.get_path(self.mtproot) + self.dp.tree.expand_row(path, False) + + + def disconnect(self, *a, **k): + ''' + Disconnects the MTP device + ''' + self.mtp.disconnect() + self.panel = None + self.connected = False + self.connecting = False + self.playlists = None + self.all = None + self.all_dict = None + + + def remove_tracks(self, tracks): + ''' + Removes tracks from the MTP device + ''' + for track in tracks: + print 'deleting ', track + self.mtp.delete_object(int(track.mtp_item_id)) + self.all.remove(track) + del self.all_dict[track.mtp_item_id] + for playlist in self.playlists: + try: + del playlist[track.mtp_item_id] + except: + pass + + + def search_tracks(self, keyword): + ''' + Searches for a keyword if one is provided, and then sorts the + results based on the panel drop-down box. + ''' + if keyword: + check = [] + for track in self.all: + for item in ('artist', 'album', 'title'): + attr = getattr(track, item) + if keyword.lower() in attr.lower(): + check.append(track) + else: + check = self.all + + new = [] + for song in check: + a = { + 'album': library.lstrip_special(song.album), + 'artist': library.lstrip_special(library.the_cutter((song.artist))), + 'title': library.lstrip_special(song.title), + 'genre': library.lstrip_special(song.genre), + 'track': song.track, + } + + if self.panel.choice.get_active() == 0: # Artist view + new.append((a['artist'], a['album'], a['track'], a['title'], song)) + elif self.panel.choice.get_active() == 1: # Album view + new.append((a['album'], a['artist'], a['track'], a['title'], song)) + else: # Genre view + new.append((a['genre'],a['artist'], a['album'], a['track'], a['title'], song)) + new.sort() + return library.TrackData([a[-1] for a in new]) + + + def put_item(self, item): + ''' + Transfers a track to the MTP device + ''' + # Just for sanity + track = item.track + metadata = pymtp.LIBMTP_Track() + + # Load the metadata from the track into a LIBMTP_Track for transfer + if (hasattr(track, 'artist')): + metadata.artist = track.artist + if (hasattr(track, 'title')): + metadata.title = track.title + if (hasattr(track, 'album')): + metadata.album = track.album + if (hasattr(track, 'track')): + metadata.tracknumber = track.track + if (hasattr(track, 'date')): + metadata.date = track.date + if (hasattr(track, 'genre')): + metadata.genre = track.genre + if (hasattr(track, '_len')): + # Convert length to milliseconds so the MTP device + # will display it properly + metadata.duration = track.get_duration() * 1000 + + song = MTPTrack(track.title, track.artist, track.album, metadata.tracknumber, + metadata.date, metadata.duration, metadata.genre) + filename = str(track.get_filename()) + loc = str(track.get_loc()) + + # Transfer the file + track_id = self.mtp.send_track_from_file(loc, filename, metadata, parent=0) + song.mtp_item_id = track_id # Store the id for removing the track later + # Assign the track a unique location + song.loc = str(track_id) + gobject.idle_add(self.all.append, song) + self.all_dict[track_id] = song + + + def get_song(self, song): + """ + Transfers a track from the device and to the /tmp/ directory + on the filesystem, and returns that track object. + """ + new_loc = "/tmp/" + song.artist + '-' + song.title + self.mtp.get_track_to_file(int(song.mtp_item_id), str(new_loc)) + song.loc = new_loc + return song + + +def initialize(): + ''' + Initializes the plugin + ''' + global PLUGIN + + if not MTP_INSTALLED: + common.error(APP.window, _("The pymtp library could not be found. Make" + "sure you install both libmtp and pytmp " + "(http://nick125.com/projects/pymtp/) before using this plugin.")) + return False + PLUGIN = MTPDeviceDriver() + if PLUGIN is None: + return False + APP.device_panel.add_driver(PLUGIN, PLUGIN_NAME) + CONNS.connect(APP, 'quit', quit) + return True + + +def destroy(): + ''' + Disconnects the device and removes the driver instance from the + device panel. + ''' + global PLUGIN + if PLUGIN.connected is True: + PLUGIN.mtp.disconnect() + CONNS.disconnect_all() + APP.device_panel.remove_driver(PLUGIN) + PLUGIN = None + + +def quit(exaile): + ''' + Disconnects the attached device when user quits exaile + ''' + global PLUGIN + if PLUGIN.connected is True: + PLUGIN.mtp.disconnect() diff -Nru exaile-0.2.11.1/plugins/shoutcast.py exaile-0.2.13/plugins/shoutcast.py --- exaile-0.2.11.1/plugins/shoutcast.py 2007-11-07 11:12:07.000000000 -0500 +++ exaile-0.2.13/plugins/shoutcast.py 2008-04-01 21:23:02.000000000 -0400 @@ -26,7 +26,7 @@ PLUGIN_ID = 'Shoutcast Radio' PLUGIN_NAME = _("Shoutcast Radio") PLUGIN_AUTHORS = ['Adam Olsen '] -PLUGIN_VERSION = '0.4.5' +PLUGIN_VERSION = '0.4.6' PLUGIN_DESCRIPTION = _(r"""Allows you to browse the Shoutcast Streaming Radio network""") PLUGIN_ENABLED = False @@ -144,11 +144,11 @@ self.model.remove(load_node) self.last_node = None for line in lines: - m = re.search(r'(\t+)