xw-devtool-cli 1.0.34 → 1.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",

package/src/commands/crosshair.js

@@ -16,40 +16,45 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Runtime.InteropServices;
-public class OverlayForm : Form {
- const int WS_EX_TRANSPARENT=0x20;
- const int WS_EX_LAYERED=0x80000;
- const int GWL_EXSTYLE=-20;
- [DllImport("user32.dll")] static extern int GetWindowLong(IntPtr hWnd, int nIndex);
- [DllImport("user32.dll")] static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
- Timer t;
- public OverlayForm(){
-  this.FormBorderStyle=FormBorderStyle.None;
-  this.TopMost=true;
-  this.ShowInTaskbar=false;
-  this.WindowState=FormWindowState.Maximized;
-  this.BackColor=Color.Fuchsia;
-  this.TransparencyKey=this.BackColor;
-  this.DoubleBuffered=true;
-  this.Cursor = Cursors.Default;
- }
- protected override void OnShown(EventArgs e){
-  base.OnShown(e);
-  int ex=GetWindowLong(this.Handle,GWL_EXSTYLE);
-  SetWindowLong(this.Handle,GWL_EXSTYLE,ex|WS_EX_LAYERED|WS_EX_TRANSPARENT);
-  t=new Timer();
-  t.Interval=16;
-  t.Tick+=(s,ev)=>{ this.Invalidate(); };
-  t.Start();
- }
- protected override void OnPaint(PaintEventArgs e){
-  var p=Cursor.Position;
+ public class OverlayForm : Form {
+  const int WS_EX_TRANSPARENT=0x20;
+  const int WS_EX_LAYERED=0x80000;
+  const int GWL_EXSTYLE=-20;
+  [DllImport("user32.dll")] static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+  [DllImport("user32.dll")] static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+  Timer t;
+  public OverlayForm(){
+   this.FormBorderStyle=FormBorderStyle.None;
+   this.TopMost=true;
+   this.ShowInTaskbar=false;
+   this.BackColor=Color.Fuchsia;
+   this.TransparencyKey=this.BackColor;
+   this.DoubleBuffered=true;
+   this.Cursor = Cursors.Default;
+   Rectangle totalBounds = Rectangle.Empty;
+   foreach(Screen s in Screen.AllScreens) {
+     totalBounds = Rectangle.Union(totalBounds, s.Bounds);
+   }
+   this.StartPosition = FormStartPosition.Manual;
+   this.Bounds = totalBounds;
+  }
+  protected override void OnShown(EventArgs e){
+   base.OnShown(e);
+   int ex=GetWindowLong(this.Handle,GWL_EXSTYLE);
+   SetWindowLong(this.Handle,GWL_EXSTYLE,ex|WS_EX_LAYERED|WS_EX_TRANSPARENT);
+   t=new Timer();
+   t.Interval=16;
+   t.Tick+=(s,ev)=>{ this.Invalidate(); };
+   t.Start();
+  }
+  protected override void OnPaint(PaintEventArgs e){
+  var p=this.PointToClient(Cursor.Position);
   var g=e.Graphics;
   using(var pen=new Pen(Color.Red,1)){
-   g.DrawLine(pen,0,p.Y,this.Width,p.Y);
-   g.DrawLine(pen,p.X,0,p.X,this.Height);
+  g.DrawLine(pen,0,p.Y,this.Width,p.Y);
+  g.DrawLine(pen,p.X,0,p.X,this.Height);
+  }
   }
- }
 }
 public static class Entry {
  public static void Main(){ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new OverlayForm()); }
@@ -81,14 +86,17 @@ public static class Entry {
         try { stdin.setRawMode(true); } catch {}
         stdin.resume();
         const onData = (data) => {
-            stdin.removeListener('data', onData);
-            try { stdin.setRawMode(false); } catch {}
-            stdin.pause();
-            process.removeListener('exit', exitHandler);
-            process.removeListener('SIGINT', exitHandler);
-            cleanup();
-            resolve();
+            const s = data.toString('utf8');
+            if (s === '\x1b') {
+                stdin.removeListener('data', onData);
+                try { stdin.setRawMode(false); } catch {}
+                stdin.pause();
+                process.removeListener('exit', exitHandler);
+                process.removeListener('SIGINT', exitHandler);
+                cleanup();
+                resolve();
+            }
         };
-        stdin.once('data', onData);
+        stdin.on('data', onData);
     });
 }

package/src/commands/imgCompress.js

@@ -124,7 +124,29 @@ async function pickPreserveStructure() {
     return choice;
 }
 
-async function compressOne(inputPath, quality, outDir, baseDir, preserveStructure) {
+async function pickTimestampSuffix() {
+    const choice = await selectFromMenu(i18next.t('imgCompress.timestampPrompt'), [
+        { name: i18next.t('imgCompress.yes'), value: true },
+        { name: i18next.t('imgCompress.no'), value: false }
+    ], true, i18next.t('common.back'));
+    if (choice === '__BACK__') return '__BACK__';
+    return choice;
+}
+
+function uniqueOutPath(dir, baseName) {
+    let candidate = path.join(dir, baseName);
+    if (!fs.existsSync(candidate)) return candidate;
+    let idx = 1;
+    const ext = path.extname(baseName);
+    const name = path.basename(baseName, ext);
+    while (true) {
+        candidate = path.join(dir, `${name}_${idx}${ext}`);
+        if (!fs.existsSync(candidate)) return candidate;
+        idx++;
+    }
+}
+
+async function compressOne(inputPath, quality, outDir, baseDir, preserveStructure, addTimestamp) {
     const ext = path.extname(inputPath).toLowerCase();
     const name = path.basename(inputPath, ext);
     const ts = dayjs().format('YYYYMMDD_HHmmss');
@@ -134,12 +156,11 @@ async function compressOne(inputPath, quality, outDir, baseDir, preserveStructur
         targetDir = path.join(outDir, rel);
         fs.mkdirSync(targetDir, { recursive: true });
     }
-    const outPath = path.join(targetDir, `${name}_compressed_${ts}${ext}`);
+    let outPath = addTimestamp ? path.join(targetDir, `${name}_compressed_${ts}${ext}`) : uniqueOutPath(targetDir, `${name}_compressed${ext}`);
     const image = sharp(inputPath, { failOnError: false });
     if (ext === '.jpg' || ext === '.jpeg') {
         await image.jpeg({ quality, mozjpeg: true }).toFile(outPath);
     } else if (ext === '.png') {
-        // Map quality (1-100) to compressionLevel (0-9) roughly
         const level = Math.max(0, Math.min(9, Math.round((100 - quality) / 10)));
         await image.png({ quality, compressionLevel: level }).toFile(outPath);
     } else if (ext === '.webp') {
@@ -179,15 +200,19 @@ export async function imgCompressHandler() {
     const outDir = path.resolve(baseDir, `compressed_${dayjs().format('YYYYMMDD_HHmmss')}`);
     fs.mkdirSync(outDir, { recursive: true });
     let preserveStructure = false;
+    let addTimestamp = true;
     if (input.type === 'folder') {
         const preserveChoice = await pickPreserveStructure();
         if (preserveChoice === '__BACK__') return;
         preserveStructure = preserveChoice;
+        const tsChoice = await pickTimestampSuffix();
+        if (tsChoice === '__BACK__') return;
+        addTimestamp = tsChoice;
     }
     const results = [];
     for (const f of files) {
         try {
-            const out = await compressOne(f, quality, outDir, baseDir, preserveStructure);
+            const out = await compressOne(f, quality, outDir, baseDir, preserveStructure, addTimestamp);
             if (out) results.push(out);
         } catch (e) {
             console.error(`${i18next.t('imgCompress.fail')}: ${f} -> ${e.message}`);

package/src/locales/en.js

@@ -155,6 +155,7 @@ export default {
         openFail: 'Failed to open directory',
         opened: 'Opened output directory',
         scanResult: 'Images found',
-        preservePrompt: 'Preserve original directory structure in output?'
+        preservePrompt: 'Preserve original directory structure in output?',
+        timestampPrompt: 'Append timestamp suffix to filename for folder compression?'
     }
 };

package/src/locales/zh.js

@@ -155,6 +155,7 @@ export default {
         openFail: '打开目录失败',
         opened: '已打开输出目录',
         scanResult: '扫描到图片数量',
-        preservePrompt: '递归时是否按原始目录结构输出'
+        preservePrompt: '递归时是否按原始目录结构输出',
+        timestampPrompt: '文件夹压缩是否在文件名添加时间戳后缀'
     }
 };