Merge pull request #2446 from UltimateHackingKeyboard/chore-unify-log…

…-optins-parsing refactor: unify log option parser of agent and usb scripts
UltimateHackingKeyboard · Dec 15, 2024 · 677118b · 677118b
2 parents f3bf32b + 28a9fac
commit 677118b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 36 deletions.
diff --git a/packages/uhk-common/src/log/get-log-options.ts b/packages/uhk-common/src/log/get-log-options.ts
@@ -7,6 +7,10 @@ export function getLogOptions(options: CommandLineArgs): LogOptions {
         return DEFAULT_LOG_OPTIONS;
     }
 
+    if (options.log === 'none') {
+        return {};
+    }
+
     return options.log
         .split(',')
         .reduce((logOptions, category) => {

diff --git a/packages/usb/src/parse-logging-options.ts b/packages/usb/src/parse-logging-options.ts
diff --git a/packages/usb/src/uhk.ts b/packages/usb/src/uhk.ts
@@ -1,9 +1,7 @@
 import { join } from 'desm';
-import { LogService } from 'uhk-common';
+import { getLogOptions, LogService } from 'uhk-common';
 import { UhkHidDevice, UhkOperations } from 'uhk-usb';
 
-import { parseLoggingOptions } from './parse-logging-options.js';
-
 export interface Uhk {
     device: UhkHidDevice;
     logger: LogService;
@@ -15,7 +13,7 @@ const rootDir = join(import.meta.url, '../../tmp');
 
 export default function (argv: any): Uhk {
     const logger = new LogService();
-    logger.setLogOptions(parseLoggingOptions(argv.log));
+    logger.setLogOptions(getLogOptions(argv));
 
     const device = new UhkHidDevice(logger, argv, rootDir);
     const operations = new UhkOperations(logger, device);