Skip to content

Commit aae29b5

Browse files
committed
v0.6.1
1 parent e9396a8 commit aae29b5

File tree

6 files changed

+26
-9
lines changed

6 files changed

+26
-9
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
CHANGELOG
22
=========
33

4-
v0.5.4
4+
v0.6.1
5+
------
6+
7+
- [x] Add track number to preview format option in preferences
8+
9+
v0.6.0
510
------
611

712
- [x] Add Home/End for command line

TODO.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
TODO & BUGS
2+
===========
3+
4+
BUGS
5+
----
6+
#1 [ ] Status bar doesn't change preview at top 2 tracks when `ArrowUp` or `PageUp` is pressed.
7+
#2 [ ] Track number is shown as `0` in preview if track number is not set for the track.

clid/_const.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
'%y': 'date',
206206
'%l': 'album',
207207
'%t': 'title',
208-
# '%n': 'track',
208+
'%n': 'track',
209209
'%a': 'artist',
210210
'%c': 'comment',
211211
# '%g': 'genre',

clid/config.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
music_dir = ~/Music
2-
preview_format = %a - %l - %t
2+
preview_format = %a - %l - %n. %t

clid/database.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ def __init__(self):
3636
super().__init__()
3737

3838
self.settings = None # set by main.ClidInterface
39-
self.file_dict = None
39+
self.file_dict = dict()
4040
self.meta_cache = dict()
41+
self.pre_format = ''
42+
self.specifiers = []
4143

4244
# IDEA: set_values and set_search_list for updating values and search_list when refreshed
4345

@@ -48,7 +50,7 @@ def filter_data(self):
4850
return self.get_all_values()
4951

5052
def load_preview_format(self):
51-
"""Make approriate varibles to hold preview formats"""
53+
"""Make approriate varibles to hold preview formats"""
5254
self.pre_format = self.settings['preview_format']
5355
self.specifiers = _const.FORMAT_PAT.findall(self.pre_format)
5456

@@ -81,8 +83,8 @@ def parse_meta_for_status(self, filename):
8183
meta = stagger.read_tag(self.file_dict[filename])
8284
temp = self.pre_format # make a copy of format and replace specifiers with tags
8385

84-
for spec in self.specifiers:
85-
temp = temp.replace(spec, getattr(meta, _const.FORMAT[spec]))
86+
for spec in self.specifiers: # str to convert track number to str if given
87+
temp = temp.replace(spec, str(getattr(meta, _const.FORMAT[spec])))
8688
self.meta_cache[filename] = temp
8789
except stagger.errors.NoTagError:
8890
self.meta_cache[filename] = _const.FORMAT_PAT.sub('', self.specifiers)
@@ -110,12 +112,12 @@ class SettingsDataBase(object):
110112
def __init__(self):
111113
self.parent = None # set by parent; see docstring
112114
self.settings = None # also set by parent
115+
self.disp_strings = []
113116
self.when_changed = {
114117
'music_dir': self.music_dir,
115118
'preview_format': self.preview_format
116119
}
117120

118-
119121
def make_strings(self):
120122
"""Make a list of strings which will be used to display the settings
121123
in the editing window
@@ -141,4 +143,3 @@ def preview_format(self):
141143
main_form.value.meta_cache = dict()
142144
main_form.value.load_preview_format()
143145
main_form.wMain.set_status(main_form.wMain.get_selected()) # change current file's preview into new format
144-

sdf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ multiline: <clid.database.SettingsDataBase object at 0xb6bacc6c>
2323
multiline: <clid.database.SettingsDataBase object at 0xb6becd4c>
2424
multiline: <clid.database.SettingsDataBase object at 0xb6b6c50c>
2525
multiline: <clid.database.SettingsDataBase object at 0xb6afc12c>
26+
multiline: <clid.database.SettingsDataBase object at 0xb6b5312c>
27+
multiline: <clid.database.SettingsDataBase object at 0xb6b5312c>
28+
multiline: <clid.database.SettingsDataBase object at 0xb6b11e4c>
29+
multiline: <clid.database.SettingsDataBase object at 0xb6b11e4c>

0 commit comments

Comments
 (0)