fixed new setting

Author: sudormrfbin

CHANGELOG.md

@@ -1,5 +1,18 @@
-Clid's Changelog
-================
+CHANGELOG
+=========
+
+v0.5.4
+------
+
+- [ ] Add preferences option for custom preview in main view
+
+
+v0.5.3
+------
+
+- [x] Add HOME and END keys to text boxes
+- [x] Fix: Error thrown if date is not of the format YYYY-MM-DD
+
 
 v0.5.2
 ------

clid/_genres.py renamed to clid/_const.py

@@ -2,8 +2,7 @@
 
 import re
 
-
-#Tuple having genres as items and numerical value used by id3v2 as index
+# Tuple having genres as items and numerical value used by id3v2 as index
 GENRES = (
     u"Blues",
     u"Classic Rock",
@@ -201,3 +200,16 @@
 
 GENRE_PAT = re.compile(r'\(([0-9]+)\)')
 
+# dict containing format specifiers to be used to display preview
+FORMAT = {
+    '%y': 'date',
+    '%l': 'album',
+    '%t': 'title',
+    '%n': 'track',
+    '%a': 'artist',
+    '%c': 'comment',
+    # '%g': 'genre',
+    '%A': 'album_artist'
+}
+
+FORMAT_PAT = re.compile(r'%.')

clid/base.py

@@ -2,15 +2,32 @@
 
 """Base classes to be used by clid"""
 
+import curses
+
 import npyscreen as npy
 
 class ClidCommandLine(npy.ActionControllerSimple):
     """Base class for the command line at the bootom of the screen"""
 
     def create(self):
-        self.add_action('^:q', self.exit_app, live=False)   # quit with ':q'
+        self.add_action('^:q$', self.exit_app, live=False)   # quit with ':q'
 
     def exit_app(self, command_line, widget_proxy, live):
         """Exit the app with ':q'"""
         exit()   # args are used internally by npyscreen
 
+
+class ClidTextfield(npy.wgtextbox.Textfield):
+    def set_up_handlers(self):
+        super().set_up_handlers()
+        self.handlers[curses.KEY_END] = self.h_end
+        self.handlers[curses.KEY_HOME] = self.h_home
+
+    def h_home(self, char):
+        self.cursor_position = 0
+
+    def h_end(self, char):
+        self.cursor_position = len(self.value)
+
+class ClidTitleText(npy.TitleText):
+    _entry_type = ClidTextfield

clid/config.ini

@@ -1 +1,2 @@
 music_dir = ~/Music
+preview_format = %a - %l - %n. %t

clid/database.py

@@ -82,11 +82,23 @@ class SettingsDataBase(object):
     """Class to manage the settings/config file.
 
        Attributes:
-            _settings(configobj.ConfigObj): `ConfigObj` object for the clid.ini file
+            _settings(configobj.ConfigObj):
+                `ConfigObj` object for the clid.ini file
+            parent(pref.PreferencesView):
+                used to refer to parent form(pref.PreferencesView)
             disp_strings(list):
                 list of formatted strings which will be used to display settings in the window
+            when_changed(dict):
+                dict of str:function; str is a setting; function to be executed when corresponding
+                setting is changed
     """
     def __init__(self):
+        self.parent = None   # set by parent; see docstring
+        self.when_changed = {
+            'music_dir': self.music_dir,
+            'preview_format': self.preview_format
+        }
+
         self._settings = configobj.ConfigObj(CONFIG)
         self.make_strings()
 
@@ -101,3 +113,12 @@ def change_setting(self, key, new):
         if key in self._settings:
             self._settings[key] = new
             self._settings.write()
+            self.when_changed[key]()
+
+    def music_dir(self):
+        main_form = self.parent.parentApp.getForm("MAIN")
+        main_form.value.load_files_and_set_values()
+        main_form.load_files()
+
+    def preview_format(self):
+        pass

clid/editmeta.py

@@ -3,11 +3,13 @@
 """Form class for editing the metadata of a track"""
 
 import os
+import curses
 
 import stagger
 import npyscreen as npy
 
-from . import _genres
+from . import _const
+from .base import ClidTitleText
 
 
 class EditMeta(npy.ActionFormV2):
@@ -25,23 +27,23 @@ def create(self):
             self.meta.album = ''   # revert what was just done
             self.meta.write()
 
-        self.tit = self.add(npy.TitleText, name='Title', value=self.meta.title)
+        self.tit = self.add(ClidTitleText, name='Title', value=self.meta.title)
         self.nextrely += 1
-        self.alb = self.add(npy.TitleText, name='Album', value=self.meta.album)
+        self.alb = self.add(ClidTitleText, name='Album', value=self.meta.album)
         self.nextrely += 1
-        self.art = self.add(npy.TitleText, name='Artist', value=self.meta.artist)
+        self.art = self.add(ClidTitleText, name='Artist', value=self.meta.artist)
         self.nextrely += 1
-        self.ala = self.add(npy.TitleText, name='Album Artist', value=self.meta.album_artist)
+        self.ala = self.add(ClidTitleText, name='Album Artist', value=self.meta.album_artist)
         self.nextrely += 2
 
-        self.gen = self.add(npy.TitleText, name='Genre', value=self.resolve_genre(self.meta.genre))
+        self.gen = self.add(ClidTitleText, name='Genre', value=self.resolve_genre(self.meta.genre))
         self.nextrely += 1
-        self.dat = self.add(npy.TitleText, name='Date/Year', value=self.meta.date)
+        self.dat = self.add(ClidTitleText, name='Date/Year', value=self.meta.date)
         self.nextrely += 1
-        self.tno = self.add(npy.TitleText, name='Track Number',
+        self.tno = self.add(ClidTitleText, name='Track Number',
                             value=str(self.meta.track if self.meta.track != 0 else ''))
         self.nextrely += 2
-        self.com = self.add(npy.TitleText, name='Comment', value=self.meta.comment)
+        self.com = self.add(ClidTitleText, name='Comment', value=self.meta.comment)
 
     def set_up_handlers(self):
         super().set_up_handlers()
@@ -59,11 +61,11 @@ def resolve_genre(self, num_gen):
                 str: Name of the genre (Electronic, Blues, etc). Returns
                 num_gen itself if it doesn't match the format.
         """
-        match = _genres.GENRE_PAT.findall(num_gen)
+        match = _const.GENRE_PAT.findall(num_gen)
 
         if match:
             try:
-                return _genres.GENRES[int(match[0])]
+                return _const.GENRES[int(match[0])]
             except IndexError:
                 return ''
         else:
@@ -84,27 +86,31 @@ def on_cancel(self):   # char is for handlers
 
     def on_ok(self):   # char is for handlers
         """Save and switch to standard view"""
-        self.meta.date = self.dat.value
-        # FIXME: error thrown when date is not in the format YYYY-MM-DD
-
-        self.meta.title = self.tit.value
-        self.meta.album = self.alb.value
-        self.meta.genre = self.gen.value
-        self.meta.artist = self.art.value
-        self.meta.comment = self.com.value
-        self.meta.album_artist = self.ala.value
+        try:
+            self.meta.date = self.dat.value
+        except ValueError:
+            npy.notify_confirm(message='Date should be of the form YYYY-MM-DD',
+                               title='Invalid Date Format', editw=1)
+            return None
 
         track = self.tno.value if self.tno.value != '' else '0'   # automatically converted to int by stagger
         try:
             int(track)
         except ValueError:
-            npy.notify_confirm(message='Track Number can only take integer values',
-                               title='Track Number not an integer', editw=0)
+            npy.notify_confirm(message='Track number can only take integer values',
+                               title='Invalid Track Number', editw=1)
             return None
         else:
             self.meta.track = track
         # FIXME: values of tags are reset to initial when ok is pressed(no prob with ^S)
 
+        self.meta.title = self.tit.value
+        self.meta.album = self.alb.value
+        self.meta.genre = self.gen.value
+        self.meta.artist = self.art.value
+        self.meta.comment = self.com.value
+        self.meta.album_artist = self.ala.value
+
         self.meta.write()
 
         status_meta = '{art} - {alb} - {tno}. {title} '.format(

clid/main.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-__version__ = '0.5.2'
+__version__ = '0.5.3'
 
 import curses
 import npyscreen as npy
@@ -109,8 +109,6 @@ def h_cursor_page_up(self, char):
             self.set_status(self.get_selected())
             self.parent.display()
 
-# TODO: make the cursor go to top/bottom if key is pressed at top/bottom ?
-
     def h_select(self, char):
         self.parent.parentApp.current_file = self.parent.value.file_dict[self.values[self.cursor_line]]
         self.parent.parentApp.switchForm("EDIT")

clid/pref.py

@@ -16,11 +16,7 @@ def create(self):
     def change_setting(self, command_line, widget_proxy, live):
         setting = command_line[5:].split(sep='=')
         self.parent.value.change_setting(setting[0], setting[1])   # writes to the ini file
-
-        # TODO: might wanna change this to something else after more choices for pref
-        main_form = self.parent.parentApp.getForm("MAIN")
-        main_form.value.load_files_and_set_values()
-        main_form.load_files()
+        self.parent.value.when_changed[setting[0]]()
 
         self.parent.load_pref()
         self.parent.wMain.display()
@@ -29,28 +25,34 @@ def change_setting(self, command_line, widget_proxy, live):
 class PrefMultiline(npy.MultiLine):
     def set_up_handlers(self):
         super().set_up_handlers()
+        
         self.handlers['1'] = self.switch_to_main
 
     def switch_to_main(self, char):
         self.parent.parentApp.switchForm("MAIN")
 
     def h_select(self, char):
+        with open('sdf', 'a') as f:
+            f.write('multiline: ' + repr(self.parent.value) + '\n')
         current_setting = self.values[self.cursor_line].split(maxsplit=1)
         self.parent.wCommand.value = ':set ' + current_setting[0] + '=' + current_setting[1]
 
 
 class PreferencesView(npy.FormMuttActiveTraditional):
     """View for editing preferences/settings"""
     MAIN_WIDGET_CLASS = PrefMultiline
-    DATA_CONTROLER = database.SettingsDataBase
     ACTION_CONTROLLER = PrefCommandLine
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.set_value(database.SettingsDataBase())
+        self.value.parent = self
+        self.load_pref()
+
+
     def create(self):
         super().create()
-        self.set_value(self.DATA_CONTROLER())
-
         self.wStatus1.value = 'Preferences '
-        self.load_pref()
 
     def load_pref(self):
         self.value.make_strings()

sdf

@@ -0,0 +1,9 @@
+multiline: <clid.database.SettingsDataBase object at 0xb6b117cc>
+multiline: <clid.database.SettingsDataBase object at 0xb6ba17ec>
+PrefCommandLine
+<clid.pref.PreferencesView object at 0xb6b9760c>
+<clid.database.SettingsDataBase object at 0xb6ba17ec>
+multiline: <clid.database.SettingsDataBase object at 0xb6b1978c>
+PrefCommandLine
+<weakproxy at 0xb6af8fcc to PreferencesView at 0xb6b025cc>
+<clid.database.SettingsDataBase object at 0xb6b1978c>

sfg

@@ -0,0 +1,2 @@
+<clid.pref.PreferencesView object at 0xb6ae6e4c>
+<clid.database.SettingsDataBase object at 0xb6af096c>