extragear/multimedia/amarok

[Nikolaj Hald Nielsen]

970916 broke searching in the collections. Most likely because some
filter values, like file names are not currently implemented by the
ServiceSqlQueryMaker.

I agree that we should find the exact reason for it and fix it, but I
would strongly argue that now is not the time to start messing with
this stuff in trunk as it is something that can cause very subtle
bugs.

- Nikolaj

On Fri, May 22, 2009 at 12:14 AM, Seb Ruiz <ruiz at kde.org> wrote:
> 2009/5/22 Nikolaj Hald Nielsen <nhnfreespirit at gmail.com>:
>> Please revert this one! It completely breaks searching in Magnatune, Jamendo
>> and the Podcast Directory services!
>>
>> Besides, we are in feature freeze for a reason, lets hold this one as a nice
>> little extra for 2.1.1.
>
> Is there are technical reason as to why it breaks? If so, then we
> should fix that instead.
>
>
>>
>> - Nikolaj
>>
>> On Thu, May 21, 2009 at 1:32 PM, Seb Ruiz <ruiz at kde.org> wrote:
>>> SVN commit 970916 by seb:
>>>
>>> Add file path to default search criteria. Patch thanks to Andreas Hartmetz.
>>> CCMAIL: ahartmetz at gmail.com
>>>
>>>  M  +3 -1      ChangeLog
>>>  M  +9 -1      src/browsers/CollectionTreeItemModelBase.cpp
>>>  M  +1 -0      src/collection/QueryMaker.h
>>>
>>>
>>> --- trunk/extragear/multimedia/amarok/ChangeLog #970915:970916
>>> @@ -5,6 +5,8 @@
>>>
>>>  VERSION 2.1-beta3
>>>   FEATURES:
>>> +    * Add file path to default search criteria. Patch thanks to Andreas
>>> +      Hartmetz <ahartmetz at gmail.com>.
>>>
>>>   CHANGES:
>>>     * Removed the "Amarok Handbook" menu entry until the handbook actually
>>> @@ -27,7 +29,7 @@
>>>       oddities. (BR 187126, BR 178973)
>>>     * Fixed large memleak when subsequent collection scans were performed.
>>>       (BR 186842)
>>> -       * Fixed possible startup crash. (BR 187126)
>>> +    * Fixed possible startup crash. (BR 187126)
>>>     * The context menu (right click) in the Current Track applet works again.
>>>       (BR 176169)
>>>     * After clicking on the Current Track applet, the menu bar at the top was
>>> --- trunk/extragear/multimedia/amarok/src/browsers/CollectionTreeItemModelBase.cpp #970915:970916
>>> @@ -498,11 +498,19 @@
>>>                 }
>>>
>>>                 //always add track filter ( if supported..)
>>> -                if ( ( validFilters & QueryMaker::TitleFilter ) != 0 ) {
>>> +                if( ( validFilters & QueryMaker::TitleFilter ) != 0 )
>>> +                {
>>>                     qm->beginOr();
>>>                     ADD_OR_EXCLUDE_FILTER( Meta::valTitle, elem.text, false, false ); //always filter for track title too
>>>                     qm->endAndOr();
>>>                 }
>>> +                //same for URL filter
>>> +                if( ( validFilters & QueryMaker::URLFilter ) != 0 )
>>> +                {
>>> +                    qm->beginOr();
>>> +                    ADD_OR_EXCLUDE_FILTER( Meta::valUrl, elem.text, false, false );
>>> +                    qm->endAndOr();
>>> +                }
>>>             }
>>>             else
>>>             {
>>> --- trunk/extragear/multimedia/amarok/src/collection/QueryMaker.h #970915:970916
>>> @@ -44,6 +44,7 @@
>>>                             GenreFilter     =     8,
>>>                             ComposerFilter  =    16,
>>>                             YearFilter      =    32,
>>> +                            URLFilter       =    64,
>>>                             AllFilters      = 65535 };
>>>
>>>         enum ReturnFunction { Count = 0,
>>>
>>
>
>
>
> --
> Seb Ruiz
>
> http://www.sebruiz.net/
> http://amarok.kde.org/
> _______________________________________________
> Amarok-devel mailing list
> Amarok-devel at kde.org
> https://mail.kde.org/mailman/listinfo/amarok-devel
>