summaryrefslogtreecommitdiff
path: root/src/worklog
diff options
context:
space:
mode:
authorWayne-Cole <77279425+Wacky404@users.noreply.github.com>2024-12-19 01:06:07 -0600
committerWayne-Cole <77279425+Wacky404@users.noreply.github.com>2024-12-19 01:06:07 -0600
commitfc89c79cf88c47a19a6162aa1d311b26d8376adb (patch)
treea03b22bc4c52d84ee67a27c99854aad8ff2d89d7 /src/worklog
parent5b94345217a6461091bfda17de75b7e07bd5e9a3 (diff)
downloadworklogger-fc89c79cf88c47a19a6162aa1d311b26d8376adb.tar.xz
worklogger-fc89c79cf88c47a19a6162aa1d311b26d8376adb.zip
feat: worked on implementing merge subcommand functionality; almost finish
Diffstat (limited to 'src/worklog')
-rwxr-xr-xsrc/worklog17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/worklog b/src/worklog
index b981201..e5903af 100755
--- a/src/worklog
+++ b/src/worklog
@@ -13,7 +13,7 @@ import os
import os.path as osp
import logging
import paths_util_worklogger as pu
-from funcs_worklogger import configure, add_log
+from funcs_worklogger import configure, add_log, combine_log
from args_worklogger import parser
from pathlib import Path
from log_util_worklogger import logger, setup_logging
@@ -33,13 +33,6 @@ formats: dict = {
# creates a NameSpace of arguments that were made
args = parser.parse_args()
-pprint(args)
-sys.exit()
-
-if args.configure:
- configure(dir_list=None)
- logger.info("Configuration completed.")
- sys.exit()
numeric_loglevel = getattr(logging, str(args.log).upper())
if isinstance(numeric_loglevel, int):
@@ -90,6 +83,12 @@ else:
BACKUPPATH = Path(osp.join(osp.expanduser("~"), "Documents", "worklogger"))
+if args.extension:
+ combine_log(target_job=args.job, specified_ext=args.extension,
+ delete=args.delete, savepath=SAVEPATH, backuppath=BACKUPPATH)
+ sys.exit()
+
+
jname_proj: dict[str, dict] = {}
if settings is not None:
for j in settings['jobs']:
@@ -145,8 +144,8 @@ try:
except Exception as e:
logger.exception(str(e))
-if settings is not None:
+if settings is not None:
add_log(file_format=formats[str(
settings['fileformat']).upper()], proj_settings=jname_proj, savepath=SAVEPATH, backuppath=BACKUPPATH, job=args.job, proj=args.project,
loc=args.location, time=args.time, start=args.start, end=args.end, message=args.message)