On 2021/01/22 16:09, Rafael Sadowski wrote: > > > > > > > > Friendly reminder. > > > > > > pkg_add chromaprint puddletag > > > > With the diff below and the installation of py3-acoustid instead > > ofchromaprint directly (of sure py3-acoustid depends on it), puddletag > > AcoustID search works without errors. > > > > For convenience I attached the puddletag update diff too. > > > > Last call :)
If the test I described works then go for it :) (Then it will only be audio/libgpod and audio/pykaraoke to go before mutagen can be updated to a py3-only version). > > > puddletag & > > > Windows / tick "Tag sources" > > > Open a dir containing an album > > > Select all files in the album > > > In the "Tag sources" window set source to AcoustID > > > Click the Search button > > > > > > This works in 1.2.0, and fails like so in 2.0.1: > > > > > > Traceback (most recent call last): > > > File > > > "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", > > > line 108, in fingerprint_file > > > return acoustid._fingerprint_file_fpcalc(fn, 120) > > > File > > > "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/_acoustid.py", > > > line 299, in _fingerprint_file_fpcalc > > > parts = line.split('=', 1) > > > TypeError: a bytes-like object is required, not 'str' > > > > > > During handling of the above exception, another exception occurred: > > > > > > Traceback (most recent call last): > > > File "/usr/local/lib/python3.8/site-packages/puddlestuff/webdb.py", > > > line 866, in search > > > return tag_source_search(self.curSource, group, files) > > > File "/usr/local/lib/python3.8/site-packages/puddlestuff/webdb.py", > > > line 557, in tag_source_search > > > albums = ts.search(primary, group[primary]) > > > File > > > "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", > > > line 314, in search > > > data, fp = match("gT8GJxhO", fn.filepath, fp, dur) > > > File > > > "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", > > > line 135, in match > > > dur, fp = fingerprint_file(path) > > > File > > > "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", > > > line 110, in fingerprint_file > > > return acoustid._fingerprint_file_fpcalc(fn) > > > TypeError: _fingerprint_file_fpcalc() missing 1 required positional > > > argument: 'maxlength' > > > > > > > > > diff --git a/audio/py-acoustid/Makefile b/audio/py-acoustid/Makefile > > index ec805e6db22..8d362e95bdf 100644 > > --- a/audio/py-acoustid/Makefile > > +++ b/audio/py-acoustid/Makefile > > @@ -2,10 +2,9 @@ > > > > COMMENT = python bindings for Chromaprint and the Acoustid API > > > > -MODPY_EGG_VERSION = 1.1.7 > > +MODPY_EGG_VERSION = 1.2.0 > > DISTNAME = pyacoustid-${MODPY_EGG_VERSION} > > PKGNAME = py-acoustid-${MODPY_EGG_VERSION} > > -REVISION = 1 > > > > CATEGORIES = audio > > > > diff --git a/audio/py-acoustid/distinfo b/audio/py-acoustid/distinfo > > index 57d63e253e6..0f9f3c893d5 100644 > > --- a/audio/py-acoustid/distinfo > > +++ b/audio/py-acoustid/distinfo > > @@ -1,2 +1,2 @@ > > -SHA256 (pyacoustid-1.1.7.tar.gz) = > > BzlKiuhGJaCm/vLYkdGWh/9ZzZVcqvSAl9ooJgQzVv0= > > -SIZE (pyacoustid-1.1.7.tar.gz) = 14990 > > +SHA256 (pyacoustid-1.2.0.tar.gz) = > > X5jjTnl0lDnqG5RAoIEZlv21sSq63M++r9o26p3VbTA= > > +SIZE (pyacoustid-1.2.0.tar.gz) = 15770 > > diff --git a/audio/py-acoustid/pkg/PLIST b/audio/py-acoustid/pkg/PLIST > > index 106f31b794d..fdaadce46c7 100644 > > --- a/audio/py-acoustid/pkg/PLIST > > +++ b/audio/py-acoustid/pkg/PLIST > > @@ -6,9 +6,9 @@ > > lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}chromaprint.${MODPY_PYC > > lib/python${MODPY_VERSION}/site-packages/acoustid.py > > lib/python${MODPY_VERSION}/site-packages/chromaprint.py > > > > lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > > -lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/.pbr.json.icloud > > > > lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > > > > lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > > > > lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt > > +lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json > > > > lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt > > > > lib/python${MODPY_VERSION}/site-packages/pyacoustid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > > > On Wed Sep 09, 2020 at 09:40:56PM +0100, Stuart Henderson wrote: > > > On 2020/09/09 21:06, Rafael Sadowski wrote: > > > > diff -u -p -u -p -r1.2 DESCR > > > > --- pkg/DESCR 7 May 2014 12:17:29 -0000 1.2 > > > > +++ pkg/DESCR 9 Sep 2020 19:04:07 -0000 > > > > @@ -1,6 +1,15 @@ > > > > puddletag is an audio tag editor similar to the Windows program, > > > > Mp3tag. > > > > It uses a spreadsheet-like layout so that all the tags you want to edit > > > > by hand are visible and easily editable. > > > > -Tagging your files can be supported by the AcoustID library, which > > > > -creates digital fingerprints from your files and uses them to search > > > > the > > > > -tag database. To enable this feature, install chromaprint. > > > > + > > > > +The usual tag editor features are supported like extracting tag > > > > information > > > > +from filenames, renaming files based on their tags by using patterns > > > > and basic > > > > +tag editing. > > > > + > > > > +There are also Functions, which can do things like replace text, trim > > > > it, do > > > > +case conversions, etc. Actions can automate repetitive tasks. Doing > > > > web lookups > > > > +using Amazon (including cover art), Discogs (does cover art too!), > > > > FreeDB and > > > > +MusicBrainz is also supported. > > > > > > Are extra packages needed for this (especially MusicBrainz)? If so, please > > > either tell users what package to install (as done previously for > > > chromaprint) > > > or just add the dep. > > > > > > > It looks like it depends one quodlibetlib: > > > > Error loading quodlibetlib: No module named 'quodlibet' > > > > After I installed audio/quodlibet, puddletag rans into: > > > > Error loading quodlibetlib: No module named 'quodlibet.parse > > > > However I do not want follow the rabbit hole. > > > > Rafael > > > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/audio/puddletag/Makefile,v > > retrieving revision 1.13 > > diff -u -p -u -p -r1.13 Makefile > > --- Makefile 19 Nov 2019 21:21:10 -0000 1.13 > > +++ Makefile 10 Sep 2020 04:21:06 -0000 > > @@ -2,32 +2,27 @@ > > > > COMMENT = spreadsheet-like audio file tagger > > > > -# Python 3 info: https://github.com/keithgg/puddletag/issues/300 > > - > > -MODPY_EGG_VERSION = 1.2.0 > > +MODPY_EGG_VERSION = 2.0.1 > > DISTNAME = puddletag-${MODPY_EGG_VERSION} > > -REVISION = 4 > > > > CATEGORIES = audio > > > > -HOMEPAGE = http://puddletag.net > > +HOMEPAGE = https://docs.puddletag.net > > > > # GPLv3 > > PERMIT_PACKAGE = Yes > > > > -MASTER_SITES = > > https://github.com/keithgg/puddletag/releases/download/v${MODPY_EGG_VERSION}/ > > -# kn: Remove with next update > > -DISTFILES = ${DISTNAME}_1{${DISTNAME}}${EXTRACT_SUFX} > > +MASTER_SITES = > > https://github.com/puddletag/puddletag/releases/download/${MODPY_EGG_VERSION}/ > > > > MODULES = lang/python > > -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} > > +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} > > MODPY_SETUPTOOLS = Yes > > > > -RUN_DEPENDS = audio/py-mutagen>=1.14 \ > > +RUN_DEPENDS = audio/py-mutagen${MODPY_FLAVOR} \ > > devel/desktop-file-utils \ > > - devel/py-configobj \ > > - devel/py-parsing>=1.5.1 \ > > - x11/py-qt4>=4.5 > > + devel/py-configobj${MODPY_FLAVOR} \ > > + devel/py-parsing${MODPY_FLAVOR} \ > > + x11/py-qt5${MODPY_FLAVOR} > > > > # Author didn't write tests > > NO_TEST = Yes > > Index: distinfo > > =================================================================== > > RCS file: /cvs/ports/audio/puddletag/distinfo,v > > retrieving revision 1.4 > > diff -u -p -u -p -r1.4 distinfo > > --- distinfo 27 Feb 2018 23:36:31 -0000 1.4 > > +++ distinfo 10 Sep 2020 04:21:06 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (puddletag-1.2.0_1.tar.gz) = > > Etqyw9u7HuY+om8Xr5aevby/HJ5CZfnZ9vbRayJxINU= > > -SIZE (puddletag-1.2.0_1.tar.gz) = 1231226 > > +SHA256 (puddletag-2.0.1.tar.gz) = > > 9cObcWjfNPtOkZ0/V2YIiPeiIYxpJJeYleK5H/m6agc= > > +SIZE (puddletag-2.0.1.tar.gz) = 1227152 > > Index: pkg/DESCR > > =================================================================== > > RCS file: /cvs/ports/audio/puddletag/pkg/DESCR,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 DESCR > > --- pkg/DESCR 7 May 2014 12:17:29 -0000 1.2 > > +++ pkg/DESCR 10 Sep 2020 04:21:06 -0000 > > @@ -1,6 +1,13 @@ > > puddletag is an audio tag editor similar to the Windows program, Mp3tag. > > It uses a spreadsheet-like layout so that all the tags you want to edit > > by hand are visible and easily editable. > > -Tagging your files can be supported by the AcoustID library, which > > -creates digital fingerprints from your files and uses them to search the > > -tag database. To enable this feature, install chromaprint. > > + > > +The usual tag editor features are supported like extracting tag information > > +from filenames, renaming files based on their tags by using patterns and > > basic > > +tag editing. > > + > > +There are also Functions, which can do things like replace text, trim it, > > do > > +case conversions, etc. Actions can automate repetitive tasks. > > + > > +Supported formats: ID3v1, ID3v2 (mp3), MP4 (mp4, m4a, etc.), VorbisComments > > +(ogg, flac), Musepack (mpc), Monkeys Audio (.ape) and WavPack (wv). > > Index: pkg/PLIST > > =================================================================== > > RCS file: /cvs/ports/audio/puddletag/pkg/PLIST,v > > retrieving revision 1.6 > > diff -u -p -u -p -r1.6 PLIST > > --- pkg/PLIST 27 Jun 2018 21:03:36 -0000 1.6 > > +++ pkg/PLIST 10 Sep 2020 04:21:06 -0000 > > @@ -2,142 +2,152 @@ > > bin/puddletag > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/ > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}about.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}action_shortcuts.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}actiondlg.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}audio_filter.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}confirmations.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}findfunc.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}funcprint.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}functions_dialogs.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}genres.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}helperwin.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}loadshortcuts.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}m3u.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}musiclib.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}pluginloader.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}puddleobjects.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}puddlesettings.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}puddletag.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}releasewidget.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}shortcutsettings.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}tagmodel.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}translations.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/${MODPY_PYCACHE}webdb.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/about.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/about.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/action_shortcuts.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/action_shortcuts.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/actiondlg.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/actiondlg.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audio_filter.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audio_filter.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/ > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}_compatid3.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}apev2.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}id3.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}mp4.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}tag_versions.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/${MODPY_PYCACHE}vorbis.${MODPY_PYC_MAGIC_TAG}pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/_compatid3.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/_compatid3.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/apev2.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/apev2.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/constants.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/constants.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/id3.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/id3.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/mp4.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/mp4.pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/tag_versions.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/tag_versions.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/util.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/util.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/vorbis.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/vorbis.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/confirmations.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/confirmations.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/constants.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/constants.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/findfunc.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/findfunc.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/funcprint.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/funcprint.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/functions.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/functions.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/functions_dialogs.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/functions_dialogs.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/genres.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/genres.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/helperwin.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/helperwin.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/ > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/${MODPY_PYCACHE}quodlibetlib.${MODPY_PYC_MAGIC_TAG}pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/quodlibetlib.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/quodlibetlib.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/loadshortcuts.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/loadshortcuts.pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/logger.py > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/m3u.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/m3u.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/ > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}action_dialogs.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}artwork.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}dirview.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}filterwin.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}funcs.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}logdialog.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}patterncombo.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}previews.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}storedtags.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}tagpanel.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/${MODPY_PYCACHE}tagtools.${MODPY_PYC_MAGIC_TAG}pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/action_dialogs.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/action_dialogs.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/artwork.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/artwork.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/dirview.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/dirview.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/filterwin.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/filterwin.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/funcs.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/funcs.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/logdialog.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/logdialog.pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/patterncombo.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/patterncombo.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/previews.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/previews.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/storedtags.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/storedtags.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagpanel.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagpanel.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagtools.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagtools.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/ > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/${MODPY_PYCACHE}dialogs.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/config.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/config.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/dialogs.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/dialogs.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/musiclib.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/musiclib.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/pluginloader.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/pluginloader.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/plugins/ > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/plugins/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/plugins/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/plugins/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/puddleobjects.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/puddleobjects.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/puddlesettings.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/puddlesettings.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/puddletag.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/puddletag.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/releasewidget.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/releasewidget.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/resource.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/resource.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/shortcutsettings.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/shortcutsettings.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagmodel.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagmodel.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/ > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/CDDB.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/CDDB.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}CDDB.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}_acoustid.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}acoust_id.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}amazon.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}discogs.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}freedb.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}musicbrainz.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}parse_html.${MODPY_PYC_MAGIC_TAG}pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/_acoustid.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/_acoustid.pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/acoust_id.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/acoust_id.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/amazon.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/amazon.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/discogs.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/discogs.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/freedb.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/freedb.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/ > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/__init__.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/__init__.pyc > > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/${MODPY_PYCACHE}/ > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > +lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/${MODPY_PYCACHE}funcs.${MODPY_PYC_MAGIC_TAG}pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/funcs.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/funcs.pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/musicbrainz.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/musicbrainz.pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/parse_html.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/parse_html.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/translations.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/translations.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/util.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/util.pyc > > lib/python${MODPY_VERSION}/site-packages/puddlestuff/webdb.py > > -lib/python${MODPY_VERSION}/site-packages/puddlestuff/webdb.pyc > > > > lib/python${MODPY_VERSION}/site-packages/puddletag-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > > > > lib/python${MODPY_VERSION}/site-packages/puddletag-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > > > > lib/python${MODPY_VERSION}/site-packages/puddletag-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > > >