[PATCH] Change collection folders setting to use paths instead of strings

[Maximilian Kossick]

On Friday 20 July 2007, Mark Kretschmann wrote:
> On 7/20/07, Maximilian Kossick <mkossick at gmx.de> wrote:
> > On Friday 20 July 2007, Krzysztof Lichota wrote:
> > > Seb Ruiz napisał(a):
> > > > On 19/07/07, Krzysztof Lichota <krzysiek at lichota.net> wrote:
> > > >> The diff is against 1.3.9, but as far as I can see in WebSVN, the
> > > >> setting is the same in newer versions.
> > > >
> > > > The diff *NEEDS* to be against current SVN, otherwise it is
> > > > impossible for us to apply to the tree and to keep track of it.
> > > >
> > > > Sorry if this inconveniences you, but why are you still on 1.3.9?
> > >
> > > This patch is for deb from Kubuntu Dapper (long term release) and on
> > > Dapper the version is 1.3.9.
> > >
> > > I do not have sources for newer amarok handy nor the time to compile
> > > it. The change is one-line and I think it is obvious how to do it.
> > > WebSVN shows that the setting is still as StringList in trunk, so I
> > > have sent a patch to notify you. Do whatever you like.
> > >
> > > BTW. In 1.3.9 dynamic playlist works without hanging Amarok, as opposed
> > > to 1.4.x versions (bug https://bugs.kde.org/show_bug.cgi?id=136575,
> > > which I have reported). So in some way it is better.
> >
> > Actually, it's not quite that obvious that your patch even works in later
> > versions of Amarok. Dynamic Collection changed the way the
> > collectionFolders are stored, and therefore your patch might not even
> > work anymore. The relevant section of code is
> > MountPointManager::collectionFolders in src/mountpointmanager.cpp
>
> Ouch, didn't consider that. Should I revert?

The patch does not break anything because AmarokConfig::collectionFolders is 
not used anymore as far as i can tell. I can see the point of being able to 
configure global defaults for Amarok's collection folder, but for it to 
actually work, there need to be additional changes in 
MountPointManager::collcetionFolders()

It should work like this:
-check if the [Collection Folders] group exists
-if not, try to read AmarokConfig::collectionFolders()
-if that QStringList is not empty, write them to the collection
folders group
-continue as normal

I'll fix that as soon as i have some time, probably this weekend (and 
definitely before the 1.4.7 freeze.

Cheers, Max
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/amarok-devel/attachments/20070720/e4a5a6b9/attachment.pgp