diff -Nru conkyrhythmbox-2.16/.bzr/branch/last-revision conkyrhythmbox-2.17/.bzr/branch/last-revision --- conkyrhythmbox-2.16/.bzr/branch/last-revision 2010-11-21 11:16:33.000000000 +0000 +++ conkyrhythmbox-2.17/.bzr/branch/last-revision 2010-12-11 10:07:21.000000000 +0000 @@ -1 +1 @@ -20 mark@towerpc1-20101121111430-ruwn05wecc1ct5z5 +21 mark@towerpc1-20101211095758-2qch00revd2r7h5a Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/checkout/dirstate and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/checkout/dirstate differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.iix and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.iix differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.rix and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.rix differ diff -Nru conkyrhythmbox-2.16/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.six conkyrhythmbox-2.17/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.six --- conkyrhythmbox-2.16/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.six 2010-11-21 11:16:33.000000000 +0000 +++ conkyrhythmbox-2.17/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.six 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Bazaar Graph Index 1 -node_ref_lists=0 -key_elements=1 -len=0 - Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.tix and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/indices/03ed3a6020887f0c941969bb2cb93fcd.tix differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.iix and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.iix differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.rix and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.rix differ diff -Nru conkyrhythmbox-2.16/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.six conkyrhythmbox-2.17/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.six --- conkyrhythmbox-2.16/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.six 1970-01-01 00:00:00.000000000 +0000 +++ conkyrhythmbox-2.17/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.six 2010-12-11 10:07:21.000000000 +0000 @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.tix and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/indices/b34f00dbb65c012b3cb20e871e975f2b.tix differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/pack-names and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/pack-names differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/packs/03ed3a6020887f0c941969bb2cb93fcd.pack and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/packs/03ed3a6020887f0c941969bb2cb93fcd.pack differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/.bzr/repository/packs/b34f00dbb65c012b3cb20e871e975f2b.pack and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/.bzr/repository/packs/b34f00dbb65c012b3cb20e871e975f2b.pack differ diff -Nru conkyrhythmbox-2.16/CHANGELOG conkyrhythmbox-2.17/CHANGELOG --- conkyrhythmbox-2.16/CHANGELOG 2010-11-21 11:16:33.000000000 +0000 +++ conkyrhythmbox-2.17/CHANGELOG 2010-12-11 10:07:21.000000000 +0000 @@ -1,3 +1,9 @@ +conkyrhythmbox (2.17) hardy; urgency=low + + * Updated main script to only actually copy over found cover art when --datatype=CA is requested + + -- Mark Buck (Kaivalagi) Sat, 11 December 2010 09:45:00 +0000 + conkyrhythmbox (2.16) hardy; urgency=low * Updated the /usr/bin/ script to dynamically call the available python exec as /usr/bin/python is linked to Python 3 (Arch) or will be at some point (Ubuntu) diff -Nru conkyrhythmbox-2.16/conkyRhythmbox.py conkyrhythmbox-2.17/conkyRhythmbox.py --- conkyrhythmbox-2.16/conkyRhythmbox.py 2010-11-21 11:16:33.000000000 +0000 +++ conkyrhythmbox-2.17/conkyRhythmbox.py 2010-12-11 10:07:21.000000000 +0000 @@ -180,11 +180,6 @@ coverart = "" else: coverart = urllib.unquote(coverart).replace("file://","") - - if coverart != "" and self.options.coverartpath != "": - self.logInfo("Copying coverart from %s to %s"%(coverart, self.options.coverartpath)) - shutil.copy(coverart, self.options.coverartpath) - coverart = self.options.coverartpath # common details genre = props["genre"] @@ -225,6 +220,9 @@ if self.musicData.coverart == None or len(self.musicData.coverart) == 0: output = None else: + self.logInfo("Copying coverart from %s to %s"%(self.musicData.coverart, self.options.coverartpath)) + shutil.copy(self.musicData.coverart, self.options.coverartpath) + self.musicData.coverart = self.options.coverartpath output = self.musicData.coverart elif datatype == "TI": #title @@ -503,7 +501,7 @@ (options, args) = parser.parse_args() if options.version == True: - print >> sys.stdout,"conkyRhythmbox v.2.16" + print >> sys.stdout,"conkyRhythmbox v.2.17" else: if options.verbose == True: print >> sys.stdout, "*** INITIAL OPTIONS:" diff -Nru conkyrhythmbox-2.16/debian/changelog conkyrhythmbox-2.17/debian/changelog --- conkyrhythmbox-2.16/debian/changelog 2010-11-21 11:16:36.000000000 +0000 +++ conkyrhythmbox-2.17/debian/changelog 2010-12-11 10:07:24.000000000 +0000 @@ -1,3 +1,9 @@ +conkyrhythmbox (2.17) hardy; urgency=low + + * Updated main script to only actually copy over found cover art when --datatype=CA is requested + + -- Mark Buck (Kaivalagi) Sat, 11 December 2010 09:45:00 +0000 + conkyrhythmbox (2.16) hardy; urgency=low * Updated the /usr/bin/ script to dynamically call the available python exec as /usr/bin/python is linked to Python 3 (Arch) or will be at some point (Ubuntu) Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/dist/conkyrhythmbox-2.16.tar.gz and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/dist/conkyrhythmbox-2.16.tar.gz differ Binary files /tmp/6ljA1Hwg96/conkyrhythmbox-2.16/dist/conkyrhythmbox-2.17.tar.gz and /tmp/KXFTZxJBeF/conkyrhythmbox-2.17/dist/conkyrhythmbox-2.17.tar.gz differ diff -Nru conkyrhythmbox-2.16/setup.py conkyrhythmbox-2.17/setup.py --- conkyrhythmbox-2.16/setup.py 2010-11-21 11:16:33.000000000 +0000 +++ conkyrhythmbox-2.17/setup.py 2010-12-11 10:07:21.000000000 +0000 @@ -32,7 +32,7 @@ setup( name = 'conkyrhythmbox', - version = '2.16', + version = '2.17', description = 'Conky Rhythmbox', long_description = "Rhythmbox info, for use in Conky", author = 'Mark Buck (Kaivalagi)',