Changeset 1315:9e3eff0dc7e0

Show
Ignore:
Timestamp:
04/28/09 16:37:10 (11 months ago)
Author:
Mickael Royer <mickael.royer@…>
Branch:
default
convert_revision:
5bf1521142cd6aa66de74c27e2e8336bad8a5d03
Message:

[sources] set global vars for audio / video default result sort and use these vars

Ignore-this: e71204aa1ffeab8d9dafebb0af864815

darcs-hash:20090428143710-b0006-e19d3df5786d44b5c8c1344213368a039ff98068.gz

committer: Mickael Royer <mickael.royer@…>

Location:
deejayd
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • deejayd/core.py

    r1311 r1315  
    694694            filter = mediafilters.Contains(type, pattern) 
    695695        songs = self.audio_library.search(filter,\ 
    696                 [("album", "ascending"), ("discnumber", "ascending"),\ 
    697                  ("tracknumber", "ascending")]) 
     696                mediafilters.DEFAULT_AUDIO_SORT) 
    698697 
    699698        return songs 

  • deejayd/mediafilters.py

    r1291 r1315  
    2424            'COMPLEX_FILTERS', 'NAME2COMPLEX', 
    2525            'And', 'Or', 
     26            "DEFAULT_AUDIO_SORT", "DEFAULT_VIDEO_SORT" 
    2627          ) 
    2728 
    … …  
    140141NAME2COMPLEX = dict([(x().get_identifier(), x) for x in COMPLEX_FILTERS]) 
    141142 
     143DEFAULT_AUDIO_SORT = [("album", "ascending"), ("discnumber", "ascending"),\ 
     144        ("tracknumber", "ascending")] 
     145DEFAULT_VIDEO_SORT = [("title", "ascending")] 
    142146 
    143147# vim: ts=4 sw=4 expandtab 

  • deejayd/sources/_base.py

    r1311 r1315  
    124124                else: 
    125125                    filter = mediafilters.And() 
    126                 sorts = [("album", "ascending"), ("discnumber", "ascending"),\ 
    127                         ("tracknumber", "ascending")] 
     126                sorts = mediafilters.DEFAULT_AUDIO_SORT 
    128127                if properties["use-limit"] == "1": 
    129128                    sorts = [(properties["limit-sort-value"],\ 

  • deejayd/sources/panel.py

    r1311 r1315  
    3838    contains_tags = ('genre','artist','album','title','all') 
    3939    sort_tags = ('genre','artist','album','title','rating','tracknumber') 
    40     default_sorts = [("album", "ascending"), ("discnumber", "ascending"), \ 
    41             ("tracknumber", "ascending")] 
     40    default_sorts = DEFAULT_AUDIO_SORT 
    4241 
    4342    def __init__(self, db, library, config): 

  • deejayd/sources/video.py

    r1291 r1315  
    3030    source_signal = 'video.update' 
    3131    sort_tags = ('title','rating','length') 
    32     default_sorts = [("title", "ascending")] 
     32    default_sorts = mediafilters.DEFAULT_VIDEO_SORT 
    3333 
    3434    def __init__(self, db, library):