gpt-po 1.0.5 → 1.0.6

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gpt-po",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "description": "command tool for translate po files by gpt",
     "main": "lib/src/index.js",
     "bin": {

package/lib/src/index.js

@@ -39,19 +39,21 @@ program
     .option("-src, --source <lang>", "source language", "English")
     .option("-l, --lang <lang>", "target language", "Simplified Chinese")
     .option("--verbose", "print verbose log")
-    .option("-o, --output <file>", "output file path, overwirte po file by default")
-    .action(({ key, host, model, po, dir, source, lang, verbose, output }) => __awaiter(void 0, void 0, void 0, function* () {
+    .addOption(new commander_1.Option("-o, --output <file>", "output file path, overwirte po file by default").conflicts("dir"))
+    .action((args) => __awaiter(void 0, void 0, void 0, function* () {
+    const { key, host, model, po, dir, source, lang, verbose, output, checkRegx } = args;
     if (host) {
         process.env.OPENAI_API_HOST = host;
     }
     if (key) {
         process.env.OPENAI_API_KEY = key;
     }
+    (0, translate_1.init)();
     if (po) {
         yield (0, translate_1.translatePo)(model, po, source, lang, verbose, output);
     }
     else if (dir) {
-        yield (0, translate_1.translatePoDir)(model, dir, source, lang, verbose, output);
+        yield (0, translate_1.translatePoDir)(model, dir, source, lang, verbose);
     }
     else {
         console.error("po file or directory is required");

package/lib/src/translate.d.ts

@@ -2,4 +2,4 @@ import { OpenAIApi } from "openai";
 export declare function init(force?: boolean): OpenAIApi;
 export declare function translate(text: string, src: string, lang: string, model?: string): Promise<import("axios").AxiosResponse<import("openai").CreateChatCompletionResponse, any>>;
 export declare function translatePo(model: string | undefined, po: string, source: string, lang: string, verbose: boolean, output: string): Promise<void>;
-export declare function translatePoDir(model: string | undefined, dir: string, source: string, lang: string, verbose: boolean, output: string): Promise<void>;
+export declare function translatePoDir(model: string | undefined, dir: string, source: string, lang: string, verbose: boolean): Promise<void>;

package/lib/src/translate.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.translatePoDir = exports.translatePo = exports.translate = exports.init = void 0;
 const fs = require("fs");
 const openai_1 = require("openai");
-const os_1 = require("os");
 const path_1 = require("path");
 const pkg = require("../package.json");
 const utils_1 = require("./utils");
@@ -31,13 +30,13 @@ function init(force) {
     }
     // load systemprompt.txt from homedir
     if (!_systemprompt || force) {
-        const systemprompt = (0, path_1.join)((0, os_1.homedir)(), "systemprompt.txt");
+        const systemprompt = (0, utils_1.findConfig)("systemprompt.txt");
         (0, utils_1.copyFileIfNotExists)(systemprompt, (0, path_1.join)(__dirname, "systemprompt.txt"));
         _systemprompt = fs.readFileSync(systemprompt, "utf-8");
     }
     // load dictionary.json from homedir
     if (!_userdict || force) {
-        const userdict = (0, path_1.join)((0, os_1.homedir)(), "dictionary.json");
+        const userdict = (0, utils_1.findConfig)("dictionary.json");
         (0, utils_1.copyFileIfNotExists)(userdict, (0, path_1.join)(__dirname, "dictionary.json"));
         _userdict = JSON.parse(fs.readFileSync(userdict, "utf-8"));
     }
@@ -45,14 +44,13 @@ function init(force) {
 }
 exports.init = init;
 function translate(text, src, lang, model = "gpt-3.5-turbo") {
-    const openai = init();
     const dicts = Object.entries(_userdict)
         .map(([k, v]) => [
         { role: "user", content: k },
         { role: "assistant", content: v },
     ])
         .flat();
-    return openai.createChatCompletion({
+    return _openai.createChatCompletion({
         model,
         temperature: 0.1,
         messages: [
@@ -79,13 +77,25 @@ function translatePo(model = "gpt-3.5-turbo", po, source, lang, verbose, output)
     return __awaiter(this, void 0, void 0, function* () {
         const potrans = yield (0, utils_1.parsePo)(po);
         const list = [];
+        const trimRegx = /(?:^ )|(?: $)/;
+        let trimed = false;
         for (const [ctx, entries] of Object.entries(potrans.translations)) {
             for (const [msgid, trans] of Object.entries(entries)) {
+                if (msgid == "")
+                    continue;
                 if (!trans.msgstr[0]) {
                     list.push(trans);
+                    continue;
+                }
+                else if (trimRegx.test(trans.msgstr[0])) {
+                    trimed = true;
+                    trans.msgstr[0] = trans.msgstr[0].trim();
                 }
             }
         }
+        if (trimed) {
+            yield (0, utils_1.compilePo)(potrans, po);
+        }
         if (list.length == 0) {
             console.log("done.");
             return;
@@ -121,7 +131,7 @@ function translatePo(model = "gpt-3.5-turbo", po, source, lang, verbose, output)
                     }
                     else {
                         console.error(error.response.status);
-                        // console.log(error.response.data);
+                        console.log(error.response.data);
                     }
                 }
                 else {
@@ -133,14 +143,14 @@ function translatePo(model = "gpt-3.5-turbo", po, source, lang, verbose, output)
     });
 }
 exports.translatePo = translatePo;
-function translatePoDir(model = "gpt-3.5-turbo", dir, source, lang, verbose, output) {
+function translatePoDir(model = "gpt-3.5-turbo", dir, source, lang, verbose) {
     return __awaiter(this, void 0, void 0, function* () {
         const files = fs.readdirSync(dir);
         for (const file of files) {
             if (file.endsWith(".po")) {
                 const po = (0, path_1.join)(dir, file);
                 console.log(`translating ${po}`);
-                yield translatePo(model, po, source, lang, verbose, output);
+                yield translatePo(model, po, source, lang, verbose, po);
             }
         }
     });

package/lib/src/utils.d.ts

@@ -1,6 +1,13 @@
 import { GetTextTranslations } from "gettext-parser";
+/**
+ * copy source file to destination file if destination file does not exist
+ * @param file destination file path
+ * @param copyFile source file path
+ */
 export declare function copyFileIfNotExists(file: string, copyFile: string): void;
 export declare function openFileByDefault(filePath: string): void;
 export declare function parsePo(poFile: string, defaultCharset?: string): Promise<GetTextTranslations>;
 export declare function compilePo(data: GetTextTranslations, poFile: string): Promise<void>;
 export declare function printProgress(progress: number, total: number, extra?: string): void;
+export declare function gitRootDir(dir?: string): string | null;
+export declare function findConfig(fileName: string): string;

package/lib/src/utils.js

@@ -1,10 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printProgress = exports.compilePo = exports.parsePo = exports.openFileByDefault = exports.copyFileIfNotExists = void 0;
-const fs = require("fs");
+exports.findConfig = exports.gitRootDir = exports.printProgress = exports.compilePo = exports.parsePo = exports.openFileByDefault = exports.copyFileIfNotExists = void 0;
 const child_process_1 = require("child_process");
+const fs = require("fs");
 const gettext_parser_1 = require("gettext-parser");
+const os_1 = require("os");
+const path = require("path");
+/**
+ * copy source file to destination file if destination file does not exist
+ * @param file destination file path
+ * @param copyFile source file path
+ */
 function copyFileIfNotExists(file, copyFile) {
+    // make sure the directory exists
+    fs.mkdirSync(path.dirname(file), { recursive: true });
     // check if file exists else create it
     try {
         fs.accessSync(file, fs.constants.F_OK);
@@ -57,4 +66,42 @@ function printProgress(progress, total, extra) {
     process.stdout.write(`\r${bar}${dots} ${percent}% ${progress}/${total} ${extra || ""}`);
 }
 exports.printProgress = printProgress;
+function gitRootDir(dir) {
+    // if dir is not provided, use current working directory
+    dir = dir || process.cwd();
+    // check if dir is a git repository
+    if (fs.existsSync(path.join(dir, ".git"))) {
+        return dir;
+    }
+    else {
+        // if dir is root directory, return null
+        if (path.dirname(dir) === dir) {
+            return null;
+        }
+        else {
+            // else, check parent directory
+            return gitRootDir(path.dirname(dir));
+        }
+    }
+}
+exports.gitRootDir = gitRootDir;
+function findConfig(fileName) {
+    const currentDir = process.cwd();
+    const gitDir = gitRootDir() || currentDir;
+    const homeDir = (0, os_1.homedir)();
+    const filePaths = [
+        path.join(currentDir, ".gpt-po", fileName),
+        path.join(gitDir, ".gpt-po", fileName),
+        path.join(homeDir, ".config", ".gpt-po", fileName)
+    ];
+    // check if file exists and return the first one
+    for (const filePath of filePaths) {
+        if (fs.existsSync(filePath)) {
+            return filePath;
+        }
+    }
+    // if no file exists, return the default one
+    return path.join(homeDir, ".gpt-po", fileName);
+}
+exports.findConfig = findConfig;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gpt-po",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "command tool for translate po files by gpt",
   "main": "lib/src/index.js",
   "bin": {