feedwarrior

commit 3619a57f01d1731d2778798d7ad162de5d2e8a05
parent e89faa25da50b566488fb126e10b1efbd2cde082
Author: nolash <dev@holbrook.no>
Date:   Sun, 28 Jun 2020 17:03:10 +0200

Add granular paths to config

Diffstat:
M
src/feedwarrior/cmd/entry.py
 | 
10
++++++++++
M
src/feedwarrior/cmd/log.py
 | 
2
+-
M
src/feedwarrior/config.py
 | 
3
+++
M
src/main.py
 | 
3
++-

4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/feedwarrior/cmd/entry.py b/src/feedwarrior/cmd/entry.py
@@ -1,9 +1,19 @@
+# standard imports
+import email
+
 def parse_args(argparser):
     argparser.add_argument('-l', required=True, help='log to add entry to')
+    argparser.add_argument('path', help='multipart file to use for content')
     return True
 
+
 def check_args(args):
     pass
 
+
+def process_as_email(config, feed, payload):
+    pass
+
 def execute(config, feed, args):
+    process_as_email(config, feed, args.path)
     pass
diff --git a/src/feedwarrior/cmd/log.py b/src/feedwarrior/cmd/log.py
@@ -19,7 +19,7 @@ def execute(config, feed, args):
     if args.command == None:
         uu = str(feed.uuid)
         logg.debug('new log {}'.format(uu))
-        log_path = os.path.join(config.data_dir, str(uu))
+        log_path = os.path.join(config.feeds_dir, str(uu))
         os.mkdir(log_path)
 
         log_meta_path = os.path.join(log_path, '.log')
diff --git a/src/feedwarrior/config.py b/src/feedwarrior/config.py
@@ -1,4 +1,5 @@
 # standard imports
+import os
 import configparser
 
 class config:
@@ -7,6 +8,8 @@ class config:
         cp = configparser.ConfigParser()
         cp.read(filename)
         self.data_dir = cp['FEEDWARRIOR']['datadir']
+        self.feeds_dir = os.path.join(cp['FEEDWARRIOR']['datadir'], 'feeds')
+        self.entries_dir = os.path.join(cp['FEEDWARRIOR']['datadir'], 'entries')
 
 def load_config(filename):
     return config(filename)
diff --git a/src/main.py b/src/main.py
@@ -60,7 +60,8 @@ else:
     sys.exit(1)
 
 try:
-    os.mkdir(config.data_dir)
+    os.makedirs(config.feeds_dir, mode=0o777, exist_ok=False)
+    os.makedirs(config.entries_dir, mode=0o777, exist_ok=False)
     logg.debug('creating datadir {}'.format(config.data_dir))
 except FileExistsError as e:
     logg.debug('using datadir {}'.format(config.data_dir))