From ebcf20a177bb3d43e5fd858d0e343c586c47c493 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Fri, 1 Apr 2016 15:00:08 +0300
Subject: Make notes subdir name configurable

---
 NEWS                           | 1 +
 jtlib/app.py                   | 6 ++++++
 jtlib/plugins/finish_plugin.py | 7 +++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index b6ab39f..0a73ac4 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ NEWS for jt
 Version 0.13+git, not yet released
 ----------------------------------
 
+* The name of the "notes" subdirectory can now be configured.
 
 Version 0.13, released 2016-02-16
 ----------------------------------
diff --git a/jtlib/app.py b/jtlib/app.py
index ddbb94a..6ea2e74 100644
--- a/jtlib/app.py
+++ b/jtlib/app.py
@@ -67,6 +67,12 @@ class JournalTool(cliapp.Application):
             'use FILE as the template for new journal notes',
             metavar='FILE')
 
+        self.settings.string(
+            ['notes-dir'],
+            'put new notes in subdirectory DIR',
+            metavar='DIR',
+            default='notes')
+
         self.settings.string(
             ['pretend-time'],
             'pretend that the time is NOW (form: YYYY-MM-DD HH:MM:DD form)',
diff --git a/jtlib/plugins/finish_plugin.py b/jtlib/plugins/finish_plugin.py
index b443a9f..f634231 100644
--- a/jtlib/plugins/finish_plugin.py
+++ b/jtlib/plugins/finish_plugin.py
@@ -59,8 +59,11 @@ class FinishCommand(cliapp.Plugin):
                 self._push_git()
 
     def _published_dir(self):
-        subdir = time.strftime('notes/%Y/%m/%d', self.app.now_tuple)
-        return os.path.join(self.app.settings['source'], subdir)
+        subdir = time.strftime('%Y/%m/%d', self.app.now_tuple)
+        return os.path.join(
+            self.app.settings['source'],
+            self.app.settings['notes-dir'],
+            subdir)
 
     def _summarise_title(self, title):
         basename = ''
-- 
cgit v1.2.1