From ce32dd7317ae1c95676c7d8a8a3964afd180ccc6 Mon Sep 17 00:00:00 2001
From: Maks Snegov <snegov@spqr.link>
Date: Fri, 28 May 2021 00:40:54 +0300
Subject: [PATCH] Create per-module loggers

---
 .gitignore                      |  2 ++
 main.py                         |  8 ++++++--
 fs.py => spqr/curateipsum/fs.py | 16 +++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)
 rename fs.py => spqr/curateipsum/fs.py (87%)

diff --git a/.gitignore b/.gitignore
index ee759a4..372e3c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,5 @@ venv.bak/
 
 # pycharm
 .idea/
+
+tmp/
diff --git a/main.py b/main.py
index 0ccbdf5..605ff13 100755
--- a/main.py
+++ b/main.py
@@ -2,10 +2,11 @@
 
 import argparse
 import logging
+import os.path
 import pathlib
 import sys
 
-import fs
+_lg = logging.getLogger('spqr.curateipsum')
 
 
 def main():
@@ -30,7 +31,10 @@ def main():
     loglevel = logging.DEBUG if args.verbose else logging.INFO
     logging.basicConfig(level=loglevel, handlers=[console_handler])
 
-    logging.info(args.src_dirs)
+    backup_dir_abs = os.path.abspath(args.backup_dir)
+    if not os.path.isdir(backup_dir_abs):
+        _lg.error("Backup directory %s does not exist, exiting", args.backup_dir)
+        return 1
 
     # fs.hardlink_dir(sys.argv[1], sys.argv[2])
     # fs.rsync(sys.argv[1], sys.argv[2])
diff --git a/fs.py b/spqr/curateipsum/fs.py
similarity index 87%
rename from fs.py
rename to spqr/curateipsum/fs.py
index a34a7d8..54e11e3 100644
--- a/fs.py
+++ b/spqr/curateipsum/fs.py
@@ -3,6 +3,8 @@ import os
 import subprocess
 from typing import Iterable
 
+_lg = logging.getLogger(__name__)
+
 
 def rsync_ext(src, dst, dry_run=False):
     """Call external rsync command"""
@@ -40,7 +42,7 @@ def rsync(src_dir, dst_dir=None):
     :return: nothing
     """
 
-    logging.info(f"Rsync: {src_dir} -> {dst_dir}")
+    _lg.info(f"Rsync: {src_dir} -> {dst_dir}")
     src_abs = os.path.abspath(src_dir)
     dst_abs = os.path.abspath(dst_dir)
 
@@ -67,7 +69,7 @@ def rsync(src_dir, dst_dir=None):
             do_update = True
 
         if do_update:
-            logging.info("Updating %s", src_entry)
+            _lg.info("Updating %s", src_entry)
 
 
 def hardlink_dir(src_dir, dst_dir):
@@ -77,12 +79,12 @@ def hardlink_dir(src_dir, dst_dir):
     :param dst_dir: path to target directory
     :return: None
     """
-    logging.info(f"Recursive hardlinking: {src_dir} -> {dst_dir}")
+    _lg.info(f"Recursive hardlinking: {src_dir} -> {dst_dir}")
     src_abs = os.path.abspath(src_dir)
     dst_abs = os.path.abspath(dst_dir)
 
     def recursive_hardlink(src, dst):
-        logging.debug(f"Creating directory: {src} -> {dst}")
+        _lg.debug(f"Creating directory: {src} -> {dst}")
         os.mkdir(dst)
 
         with os.scandir(src) as it:
@@ -93,18 +95,18 @@ def hardlink_dir(src_dir, dst_dir):
                     recursive_hardlink(ent.path, ent_dst_path)
                     continue
                 if ent.is_file(follow_symlinks=False) or ent.is_symlink():
-                    logging.debug(f"Hardlink file: {ent.path} -> {ent_dst_path}")
+                    _lg.debug(f"Hardlink file: {ent.path} -> {ent_dst_path}")
                     os.link(ent.path, ent_dst_path, follow_symlinks=False)
                     continue
                 # something that is not a file, symlink or directory
                 raise NotImplementedError(ent.path)
 
     if not os.path.isdir(src_abs):
-        logging.error(f"Error reading source directory: {src_dir}")
+        _lg.error(f"Error reading source directory: {src_dir}")
         raise RuntimeError(f"Error reading source directory: {src_dir}")
 
     if os.path.exists(dst_abs):
-        logging.error(f"Destination already exists: {dst_dir}")
+        _lg.error(f"Destination already exists: {dst_dir}")
         raise RuntimeError(f"Destination already exists: {dst_dir}")
 
     recursive_hardlink(src_abs, dst_abs)