pyutilscripts 0.3.0b0__tar.gz → 0.5.1__tar.gz

pyutilscripts-0.5.1/PKG-INFO

@@ -0,0 +1,82 @@
+Metadata-Version: 2.4
+Name: pyutilscripts
+Version: 0.5.1
+Summary: PyUtilScripts 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。
+Author-email: Zero Kwok <zero.kwok@foxmail.com>
+License: MIT License
+Project-URL: Homepage, https://github.com/ZeroKwok/pyutilscripts
+Project-URL: Issues, https://github.com/ZeroKwok/pyutilscripts/issues
+Keywords: tools
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: Software Development :: Build Tools
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: click
+Requires-Dist: natsort
+Requires-Dist: termcolor
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Dynamic: license-file
+
+# **PyUtilScripts**  
+
+`PyUtilScripts` 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。  
+
+## 📦 安装
+
+### 通过 pip 安装
+
+```bash
+pip install pyutilscripts
+```
+
+### 从源码安装
+
+```bash
+git clone https://github.com/ZeroKwok/PyUtilScripts.git
+cd PyUtilScripts
+pip install .
+```
+
+---
+
+## 📝 使用说明
+
+- **fcopy**
+  - 基于清单文件的复制工具
+  - 特点
+    - 支持 更新、覆盖写、重命名模式
+    - 支持 交互模式，精准把控拷贝细节（拷贝前生成行动列表，在用户编辑或确认后，才具体执行行动列表中记录的动作）
+    - 支持 过滤模式，忽略某些文件或目录
+  - 示例：
+    - 按文件清单拷贝指定目录下的文件
+      - 更新模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest`
+      - 覆盖模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -m o`
+      - 重命名模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -m r`
+    - 通过指定目录下的文件生成文件清单
+      - `fcopy -l /path/to/list.txt -s /path/to/src --update-list`
+    - 交互模式下拷贝指定目录的文件
+      - `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -i`
+  - 概念
+    - 文件清单(fcopy.list)决定要拷贝的文件
+    - 行动清单决定拷贝行为(交互模式下通过编辑器呈现)
+
+- **prunedirs**
+  - 递归删除空目录
+  - 示例：
+    - `prunedirs /path/to/dir`
+
+- **forward.tcp**
+  - TCP 端口转发工具
+  - 示例：
+    - `forward.tcp -s 0.0.0.0:8081 -d 127.0.0.1:1081`

pyutilscripts-0.5.1/README.md

@@ -0,0 +1,52 @@
+# **PyUtilScripts**  
+
+`PyUtilScripts` 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。  
+
+## 📦 安装
+
+### 通过 pip 安装
+
+```bash
+pip install pyutilscripts
+```
+
+### 从源码安装
+
+```bash
+git clone https://github.com/ZeroKwok/PyUtilScripts.git
+cd PyUtilScripts
+pip install .
+```
+
+---
+
+## 📝 使用说明
+
+- **fcopy**
+  - 基于清单文件的复制工具
+  - 特点
+    - 支持 更新、覆盖写、重命名模式
+    - 支持 交互模式，精准把控拷贝细节（拷贝前生成行动列表，在用户编辑或确认后，才具体执行行动列表中记录的动作）
+    - 支持 过滤模式，忽略某些文件或目录
+  - 示例：
+    - 按文件清单拷贝指定目录下的文件
+      - 更新模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest`
+      - 覆盖模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -m o`
+      - 重命名模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -m r`
+    - 通过指定目录下的文件生成文件清单
+      - `fcopy -l /path/to/list.txt -s /path/to/src --update-list`
+    - 交互模式下拷贝指定目录的文件
+      - `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -i`
+  - 概念
+    - 文件清单(fcopy.list)决定要拷贝的文件
+    - 行动清单决定拷贝行为(交互模式下通过编辑器呈现)
+
+- **prunedirs**
+  - 递归删除空目录
+  - 示例：
+    - `prunedirs /path/to/dir`
+
+- **forward.tcp**
+  - TCP 端口转发工具
+  - 示例：
+    - `forward.tcp -s 0.0.0.0:8081 -d 127.0.0.1:1081`

{pyutilscripts-0.3.0b0 → pyutilscripts-0.5.1}/pyproject.toml

@@ -10,6 +10,7 @@ keywords = ["tools"]
 readme = "README.md"
 requires-python = ">=3.7"
 license = {text = "MIT License"}
+dynamic = ["version"]
 classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Build Tools",
@@ -24,9 +25,16 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
+    "click",
+    "natsort",
     "termcolor",
 ]
-dynamic = ["version"]
+
+[project.optional-dependencies]
+dev = [
+    "pytest",
+    "pytest-cov",
+]
 
 [tool.setuptools.dynamic]
 version = {attr = "pyutilscripts.projectVersion"}

{pyutilscripts-0.3.0b0 → pyutilscripts-0.5.1}/pyutilscripts/__init__.py

@@ -2,8 +2,8 @@
 PyUtilScripts 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。
 """
 
-__version__ = "0.3.0"
-__status__  = "beta0"
+__version__ = "0.5.1"
+__status__  = ""
 __author__  = "zero <zero.kwok@foxmail.com>"
 
 projectName    = 'PyUtilScripts'

{pyutilscripts-0.3.0b0 → pyutilscripts-0.5.1}/pyutilscripts/fcopy.py

@@ -11,6 +11,8 @@
 import os
 import re
 import sys
+import stat
+import math
 import shlex
 import click
 import shutil
@@ -29,18 +31,21 @@ from . import utils
 
 CopyModes = ["update", "overwrite", "rename", "u", "o", "r"]
 
-ListFileHeader = """# File list generated by fcopy on {}
+ListFileHead = """# File list generated by fcopy on {Date}
 # One file per line, relative to source directory
+# From  : {Source}
+# Count : {Count}
 """
 
-ActionsFileHeader = """# Action plan for file copying (edit this file to change actions)
-# Actions:
+ActionFileHead = """# Action plan for file copying (edit this file to change actions)
 #
+# Actions:
 # c - Copy, when target doesn't exist
 # u - Update, when target exists with mismatched metadata but source is newer
 # o - Overwrite, when target exists, unconditionally copy and overwrite (--mode overwrite)
 # r - Rename, when target exists, copy with incremented filename (--mode rename)
-# i - Ignore, when target exists with mismatched metadata but deep comparison shows no difference
+# m - Make directory, when target is a directory and doesn't exist
+# i - Ignore, when target exists with mismatched metadata but deep comparison shows no difference or source is older
 # s - Skip, when target exists and no differences found in shallow or deep comparison
 #
 # Example:
@@ -48,8 +53,62 @@ ActionsFileHeader = """# Action plan for file copying (edit this file to change
 # r file3.txt -> file(3).txt    Copy and Rename to file(3).txt
 # o file2.txt                   Overwrite
 # s file2.txt                   Skipped because the files are the same
+#
+# Source Directory: {Source}
+# Target Directory: {Target}
+# Action Count    : {Count}
 """
 
+ActionNames = {'c': 'Copying', 'u': 'Updating', 'o': 'Replacing',
+               'r': 'Renaming', 'm': 'MakingDir', 'i': 'Ignored', 's': 'Skipped'}
+
+def output(level, *args, **kwargs):
+    """
+    Output messages with specified level.
+    0 - error (red, stderr)
+    1 - warning (yellow, stderr) - can be treated as error in strict mode
+    2 - normal output (stdout)
+    3 - verbose (stdout, only when verbose enabled)
+    """
+
+    # Extract control parameters
+    verbose_mode = kwargs.pop('verbose', False)
+    strict_mode = kwargs.pop('strict', False)
+
+    # Handle verbose filtering
+    if level > 2 and not verbose_mode:
+        return
+
+    # Handle strict mode: upgrade warnings to errors
+    if level == 1 and strict_mode:
+        level = 0
+
+    # Add appropriate prefixes
+    if len(args) == 0:
+        args = ('',)
+
+    if level == 0:
+        args = ('Error: ' + args[0], *args[1:],)
+    elif level == 1:
+        args = ('Warning: ' + args[0], *args[1:],)
+
+    # Set output destination and color
+    if level == 0:
+        kwargs.setdefault('file', sys.stderr)
+        kwargs.setdefault('color', 'red')
+    elif level == 1:
+        kwargs.setdefault('file', sys.stderr)
+        kwargs.setdefault('color', 'yellow')
+    elif level == 2:
+        kwargs.setdefault('file', sys.stdout)
+    elif level == 3:
+        kwargs.setdefault('file', sys.stdout)
+        kwargs.setdefault('color', 'blue')  # Optional: different color for verbose
+
+    # Output the message
+    cprint(*args, **kwargs)
+
+
 def read_file_list(filename, comment='#', keep_comments=False):
     """Read the list of files to copy from the manifest file."""
     if filename is None:
@@ -66,11 +125,13 @@ def read_file_list(filename, comment='#', keep_comments=False):
         files.append(line)
     return files
 
+
 def filter_match(file, patterns):
     if not patterns:
         return False
     return any(p.match(file) for p in patterns)
 
+
 def read_file_filter(filename, comment='#'):
     patterns = []
     try:
@@ -80,21 +141,28 @@ def read_file_filter(filename, comment='#'):
         pass # ignore missing file
     return patterns
 
+
 def make_file_list(source, filters=[], verbose=False):
-    files = []
-    for root, _, names in os.walk(source):
+    def handle_files(files, root, names):
         for n in names:
             filename = os.path.join(root, n)
             filename = os.path.relpath(filename, start=source)
             if filter_match(filename, filters):
-                if verbose:
-                    cprint(f"Filtered: {filename}", "yellow")
+                output(3, f"Filtered: {filename}", verbose=verbose)
                 continue
             files.append(filename)
 
+    dirs = []
+    files = []
+    for root, _dirs, _files in os.walk(source):
+        handle_files(dirs, root, _dirs)
+        handle_files(files, root, _files)
+
     date = datetime.now().isoformat(timespec='seconds')
-    head = ListFileHeader.format(date).splitlines()
-    return head + natsorted(files)
+    info = f'{len(dirs)} directories, {len(files)} files'
+    head = ListFileHead.format(Date=date, Source=source, Count=info).splitlines()
+    return head + [''] + natsorted(dirs + files)
+
 
 def update_file_list(args):
     """Update the file list with the current contents of the source directory."""
@@ -129,13 +197,14 @@ def update_file_list(args):
     cprint(f"\nUpdate {args.list} with these changes? [y/N]", end=" ")
     confirm = input().strip().lower()
     if confirm != 'y':
-        cprint('User Cancelled', "red", file=sys.stderr)
+        output(0, 'User Cancelled')
         return 1
 
     with open(args.list, 'w') as f:
         f.write('\n'.join(new))
     return 0
 
+
 def file_cmp(file1, file2, stat1, stat2) -> Tuple[bool, int]:
     """Compare two files and return a tuple of (is_same, meta_cmp)."""
     # 浅比较, 比较文件大小和修改时间
@@ -160,6 +229,7 @@ def file_cmp(file1, file2, stat1, stat2) -> Tuple[bool, int]:
         return True, meta_cmp
     return False, meta_cmp
 
+
 def increment_filename(directory, filename, rename_list):
     """
     在指定目录中为给定文件名生成不冲突的新文件名（仅文件名部分，不含路径）。
@@ -198,6 +268,7 @@ def increment_filename(directory, filename, rename_list):
 
     return components / candidate 
 
+
 class Action:
     """Action类用于描述操作行为"""
     def __init__(self, action: str, src: str, dst: str = '', common: str = None):
@@ -210,32 +281,40 @@ class Action:
         return iter((self.action, self.src, self.dst))
 
     def natsorted(actions):
-        priority = {c: i for i,c in enumerate(['c', 'u', 'o', 'r', 'i', 's'])}
+        priority = {c: i for i,c in enumerate(['m', 'c', 'u', 'o', 'r', 'i', 's'])}
         return natsorted(actions, key=lambda a: (priority[a.action], a.src, a.dst))
 
+
 def make_actions(args):
     items: List[Action] = []
     rename_list: List[str] = []
 
     for file in args.manifest:
-        if filter_match(file, args.filter_patterns):
-            if args.verbose:
-                cprint(f"Filtered: {file}", "yellow")
-            continue
-
         source = os.path.normpath(os.path.join(args.source, file))
         target = os.path.normpath(os.path.join(args.target, file))
+
+        # 过滤掉名单中的文件
+        if filter_match(source, args.filter_patterns):
+            output(2, f"Filtered: {file}", verbose=args.verbose)
+            continue
+
         try:
             stat1 = os.stat(source)
         except:
             # 源文件不存在则发出警告, 不视为错误
-            cprint(f"Warn: SourceFileNotFound -> {source}", "magenta", file=sys.stderr)
+            output(1, f"SourceFileNotFound: {file}", strict=args.strict)
             continue
 
         try:
             stat2 = os.stat(target)
         except FileNotFoundError:
-            items.append(Action('c', file))
+            if stat.S_ISDIR(stat1.st_mode):
+                items.append(Action('m', file))
+            else:
+                items.append(Action('c', file))
+            continue
+
+        if stat.S_ISDIR(stat1.st_mode): # 目录直接跳过, 因为拷贝文件会尝试创建目录
             continue
 
         if args.mode in ('r', 'rename'):
@@ -250,14 +329,18 @@ def make_actions(args):
 
         # update mode
         is_same, meta_cmp = file_cmp(source, target, stat1, stat2)
-        common = lambda: (
-            [
-                f"src: {utils.format_ftime(stat1.st_mtime)}, {utils.format_bytes(stat1.st_size)}",
-                f"dst: {utils.format_ftime(stat2.st_mtime)}, {utils.format_bytes(stat2.st_size)}"
-            ]
-            if meta_cmp != 0
-            else None
-        )
+        def common():
+            if args.verbose > 0:
+                return (
+                    [
+                        f"src: {utils.format_ftime(stat1.st_mtime)}, {utils.format_bytes(stat1.st_size)}",
+                        f"dst: {utils.format_ftime(stat2.st_mtime)}, {utils.format_bytes(stat2.st_size)}",
+                    ]
+                    if meta_cmp != 0
+                    else None
+                )
+            else:
+                return {0: None, 1: ["src newer",], -1: ["dst newer",]}[meta_cmp]
 
         if is_same:
             items.append(Action('s' if meta_cmp == 0 else 'i', file, common=common()))
@@ -266,6 +349,7 @@ def make_actions(args):
 
     return Action.natsorted(items)
 
+
 def parse_actions(lines, comment='#'):
     files = []
     for row, line in enumerate(lines):
@@ -276,11 +360,15 @@ def parse_actions(lines, comment='#'):
         # Handle action-prefixed lines (for edit mode)
         if ' ' not in line:
             raise ValueError(f"Invalid line: {row}: {line}")
+        fields = shlex.split(line, posix=os.name != 'nt')
 
-        if '->'in line:
-            fields = shlex.split(line, posix=os.name != 'nt')
-        else:
-            fields = line.split(maxsplit=1)
+        # remove comments fields
+        result = []
+        for f in fields:
+            if f.startswith(comment):
+                break
+            result.append(f)
+        fields = result
 
         if len(fields) == 2: 
             action, file1, file2 = fields + ['']
@@ -292,36 +380,66 @@ def parse_actions(lines, comment='#'):
 
     return files
 
+
 def read_file_actions(filename, comment='#'):
     return parse_actions(read_file_list(filename, comment, True), comment)
 
-def join_actions(actions:list[Action], header:str, verbose:int):
+
+def line_append_space(line, align=16, minLength=32):
+    l = len(line)
+    n = math.ceil(l / align) * align
+    n = max(n, minLength)
+    return line + max(n - l, 1) * ' '
+
+
+def join_actions(actions:list[Action], head:str, args):
     lines = []
+    current = ''
+    counter = {}
     for item in actions:
-        line = f'{item.action}  "{item.src}"'
+        # 统计
+        if current != item.action:
+            current = item.action
+            counter[item.action] = 0
+            lines.append('')
+            lines.append(f"# {ActionNames[item.action]} Files: {{{item.action}}}")
+        counter[item.action] += 1
+
+        line = f'{item.action} "{item.src}"'
         if item.dst:
             line += f' -> "{item.dst}"'
+        if item.common and args.verbose <= 0:
+            line = line_append_space(line) + f'# {",".join(item.common)}'
         lines.append(line)
 
-        for c in item.common or []:
-            lines.append(f'   # {c}')
+        if args.verbose > 0: # 注释以独立的行存在
+            for c in item.common or []:
+                lines.append(f'   # {c}')
+    info = str(counter).replace("'", "")
+    head = head.format(Source=args.source, Target=args.target, Count=info)
+    body = "\n".join(lines)
+    body = body.format(**counter)
 
-    return header.rstrip() + "\n\n" + "\n".join(lines) + "\n"
+    return head.rstrip() + "\n" + body + "\n"
 
-def print_actions(actions:list, header:str, verbose:int):
-    print()
-    cprint(f"The following actions will be performed:", "yellow")
-    lines = join_actions(actions, header, verbose)
+
+def print_actions(actions:list, head:str, args):
+    output(2)
+    output(2, f"The following actions will be performed:", "yellow")
+
+    lines = join_actions(actions, head, args)
     for line in lines.splitlines():
         if not line:
-            print()
+            output(2)
             continue
 
-        a = line[0]
-        c = {"#": "dark_grey", "s": "yellow", "o": "green", "c": "green", " ": "white"}
+        a = line.strip()[0]
+        c = {"#": "dark_grey", "s": "yellow", "o": "green",
+             "c": "green", "m": "cyan", " ": "white"}
         f = a if a in c else " "
-        cprint(line, c[f])
-    print()
+        output(2, line, c[f])
+    output(2)
+
 
 def get_available_editor(defaults=("micro", "nano", "vim", "vi", "notepad")):
     """检查哪个编辑器可用，返回第一个可用的，否则返回 None"""
@@ -333,71 +451,86 @@ def get_available_editor(defaults=("micro", "nano", "vim", "vi", "notepad")):
             return editor
     return None
 
-def edit_actions(actions:list, header:str, verbose:int) -> list:
+
+def edit_actions(actions:list, head:str, args) -> list:
     """
     使用 click.edit() 启动编辑器让用户编辑行动计划。
     返回: None 用户取消编辑或没保存
     """
-    content = join_actions(actions, header, verbose)
+    content = join_actions(actions, head, args)
 
     # 打开编辑器让用户编辑内容
     edited = click.edit(content, extension=".actions-todo", editor=get_available_editor())
     if edited is None:
-        cprint("User canceled or didn't save, aborted.", "red", file=sys.stderr)
+        output(0, "User canceled or didn't save, aborted.")
         raise SystemExit()
 
     # 解析用户编辑后的结果
     return parse_actions(edited.splitlines(), '#')
 
+
 def copy_files(args):
     """Copy files from source directory to target directory with specified manifest"""
     args.manifest = read_file_list(args.list)
     if not args.manifest:
-        cprint('Error: list file is empty or invalid.', "red", file=sys.stderr)
+        output(0, 'list file is empty or invalid.')
         return 1
 
     actions = make_actions(args)
     if not actions:
-        cprint("Error: No actions to perform.", "red", file=sys.stderr)
+        output(0, "Error: No actions to perform.")
         return 1
 
     if args.interactive:
-        actions = edit_actions(actions, ActionsFileHeader, args.verbose)
+        actions = edit_actions(actions, ActionFileHead, args)
     elif args.dry_run or args.verbose > 1:
-        print_actions(actions, ActionsFileHeader, args.verbose)
+        print_actions(actions, ActionFileHead, args)
 
     copied, skipped = 0, 0
     for action, file1, file2 in actions:
         file2 = file2 or file1
-        if action == 's':
+        if action in ('s', 'i'):
             skipped += 1
             continue
 
+        source = os.path.normpath(os.path.join(args.source, file1))
+        target = os.path.normpath(os.path.join(args.target, file2))
+
         if action in ('c', 'u', 'o', 'r'):
-            source = os.path.normpath(os.path.join(args.source, file1))
-            target = os.path.normpath(os.path.join(args.target, file2))
             if os.path.isdir(source):
                 continue
 
-            prefix = {'c': 'Copying', 'o': 'Replacing', 'u': 'Updating', 'r': 'Renaming'}[action]
+            prefix = ActionNames[action]
             if args.dry_run:
-                cprint(f"Dry run: {prefix}: {file1} -> {file2}", "cyan")
+                output(2, f"Dry run: {prefix}: {file1} -> {file2}", "cyan")
             elif args.verbose > 0:
-                cprint(f"{prefix} {file1} -> {file2}", 'green')
+                output(2, f"{prefix} {file1} -> {file2}", 'green')
             else:
-                cprint(f"{prefix} {file1}", 'green')
+                output(2, f"{prefix} {file1}", 'green')
 
             if not args.dry_run:
                 try:
                     os.makedirs(os.path.dirname(target), exist_ok=True)
                     shutil.copy2(source, target)
                 except OSError as e:
-                    cprint(f"Error copying {source} to {target}: {e}", "red", file=sys.stderr)
+                    output(0, f"{prefix} {source} to {target}: {e}")
+                    if args.strict:
+                        return 1
             copied += 1
 
-    cprint(f"Done. {copied} files copied, {skipped} skipped.")
+        elif action == 'm':
+            try:
+                os.makedirs(target, exist_ok=True)
+            except OSError as e:
+                output(0, f"{prefix} {source} to {target}: {e}")
+                if args.strict:
+                    return 1
+            copied += 1
+
+    output(2, f"Done. {copied} files copied, {skipped} skipped.")
     return 0
 
+
 def main():
     try:
         parser = argparse.ArgumentParser(
@@ -410,9 +543,10 @@ def main():
         parser.add_argument("-m", "--mode", default="update", choices=CopyModes, help="copy mode: u|update, o|overwrite, r|rename")
         parser.add_argument("-i", "--interactive", action="store_true", help="Let the user edit the list of action plans to copy")
         parser.add_argument("-v", "--verbose", action="count", default=0, help="increase verbosity level (use -vv for more detail)")
-        parser.add_argument('--filter', default='fcopy.filter', help='file containing blacklist regex patterns, one per line.')
+        parser.add_argument('--filter', help='file containing blacklist regex patterns, one per line.')
         parser.add_argument("--update-list", action="store_true", help="update the --list file with current --source contents (with confirmation)")
         parser.add_argument("--dry-run", action="store_true", help="simulate operations without actually copying files")
+        parser.add_argument("--strict", action="store_true", help="treat warnings as errors (exit with non-zero code on warnings)")
         parser.add_argument('--debug', action='store_true', default=False, help=argparse.SUPPRESS)
 
         try:
@@ -431,36 +565,37 @@ def main():
             input('Wait for debugging and press Enter to continue...')
 
         if not args.list or not args.source:
-            cprint("Error: Please provide the required arguments.", "red", file=sys.stderr)
+            output(0, "Please provide the required arguments.")
             parser.print_help()
             return 1
 
         args.mode = args.mode.lower()
         args.source = os.path.normpath(os.path.abspath(args.source))
         if not os.path.isdir(args.source):
-            cprint(f"Error: Source directory '{args.source}' does not exist", "red", file=sys.stderr)
+            output(0, f"Source directory '{args.source}' does not exist")
             return 1
 
         # Read the filter file
         args.filter_patterns = read_file_filter(args.filter)
         if not args.filter_patterns and "_specified" in vars(args) and "filter" in args._specified:
-            cprint(f"Warning: No valid patterns found in filter file '{args.filter}'.", "yellow")
+            output(1, f"No valid patterns found in filter file '{args.filter}'.", strict=args.strict)
 
         # Check if running in the terminal, because editor is only available in terminal
         if args.interactive and not sys.stdout.isatty():
-            cprint("Warning: Not running in the terminal (may be a redirect or pipe)", "yellow")
+            output(1, "Not running in the terminal (may be a redirect or pipe)", strict=args.strict)
 
         if args.update_list:
             return update_file_list(args)
         else:
             if args.target is None:
-                cprint(f"Error: Please provide the target directory.")
+                output(0, "Please provide the target directory.")
                 return 1
             args.target = os.path.normpath(os.path.abspath(args.target))
             return copy_files(args)
 
     except KeyboardInterrupt:
-        cprint('\nKeyboard Interrupt', 'red', end='')
+        output(2)
+        output(0, "Keyboard Interrupt", end='')
         return 1
 
 if __name__ == "__main__":

pyutilscripts-0.5.1/pyutilscripts.egg-info/PKG-INFO

@@ -0,0 +1,82 @@
+Metadata-Version: 2.4
+Name: pyutilscripts
+Version: 0.5.1
+Summary: PyUtilScripts 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。
+Author-email: Zero Kwok <zero.kwok@foxmail.com>
+License: MIT License
+Project-URL: Homepage, https://github.com/ZeroKwok/pyutilscripts
+Project-URL: Issues, https://github.com/ZeroKwok/pyutilscripts/issues
+Keywords: tools
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: Software Development :: Build Tools
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: click
+Requires-Dist: natsort
+Requires-Dist: termcolor
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Dynamic: license-file
+
+# **PyUtilScripts**  
+
+`PyUtilScripts` 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。  
+
+## 📦 安装
+
+### 通过 pip 安装
+
+```bash
+pip install pyutilscripts
+```
+
+### 从源码安装
+
+```bash
+git clone https://github.com/ZeroKwok/PyUtilScripts.git
+cd PyUtilScripts
+pip install .
+```
+
+---
+
+## 📝 使用说明
+
+- **fcopy**
+  - 基于清单文件的复制工具
+  - 特点
+    - 支持 更新、覆盖写、重命名模式
+    - 支持 交互模式，精准把控拷贝细节（拷贝前生成行动列表，在用户编辑或确认后，才具体执行行动列表中记录的动作）
+    - 支持 过滤模式，忽略某些文件或目录
+  - 示例：
+    - 按文件清单拷贝指定目录下的文件
+      - 更新模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest`
+      - 覆盖模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -m o`
+      - 重命名模式 `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -m r`
+    - 通过指定目录下的文件生成文件清单
+      - `fcopy -l /path/to/list.txt -s /path/to/src --update-list`
+    - 交互模式下拷贝指定目录的文件
+      - `fcopy -l /path/to/list.txt -s /path/to/src -t /path/to/dest -i`
+  - 概念
+    - 文件清单(fcopy.list)决定要拷贝的文件
+    - 行动清单决定拷贝行为(交互模式下通过编辑器呈现)
+
+- **prunedirs**
+  - 递归删除空目录
+  - 示例：
+    - `prunedirs /path/to/dir`
+
+- **forward.tcp**
+  - TCP 端口转发工具
+  - 示例：
+    - `forward.tcp -s 0.0.0.0:8081 -d 127.0.0.1:1081`

{pyutilscripts-0.3.0b0 → pyutilscripts-0.5.1}/pyutilscripts.egg-info/SOURCES.txt

@@ -12,5 +12,6 @@ pyutilscripts.egg-info/entry_points.txt
 pyutilscripts.egg-info/requires.txt
 pyutilscripts.egg-info/top_level.txt
 pyutilscripts/utils/__init__.py
+tests/test_action_parser.py
 tests/test_fcopy.py
 tests/test_fcopy_cli.py

pyutilscripts-0.5.1/pyutilscripts.egg-info/requires.txt

@@ -0,0 +1,7 @@
+click
+natsort
+termcolor
+
+[dev]
+pytest
+pytest-cov

pyutilscripts-0.5.1/tests/test_action_parser.py

@@ -0,0 +1,63 @@
+
+import os
+import shlex
+import pytest
+from unittest import mock
+from pyutilscripts import fcopy
+
+valid = [
+'c file1.txt',
+'c file3.txt -> file(3).txt',
+' s file2.txt  -> file(2).txt',
+' s "fi le2.txt"  -> "fi le(2).txt"',
+" s 'fi le2.txt'  -> 'fi le(2).txt'",
+' s "fi le2.txt"',
+" s 'fi #le2.txt'",
+'o file2.txt',
+'o sss\\file2.txt',
+'o sss//file2.txt',
+
+'o sss//file2##.txt',
+'o sss//file2##.txt # comment here',
+'o sss//file2##.txt #comment here',
+" s 'fi le2.txt'  -> 'fi le(2).txt' #comment",
+]
+
+invalid = [
+' s fi le2.txt"',
+' s "fi le2.txt',
+]
+
+def debug_actions_parse():
+    for index, line in enumerate(valid + invalid, 0):
+        try:
+            fields = shlex.split(line, posix=os.name != 'nt')
+            print(f'{index} fields: {fields}')
+
+            # remove comments fields
+            result = []
+            for f in fields:
+                if f.startswith('#'):
+                    break
+                result.append(f)
+            fields = result
+
+            if len(fields) == 2: 
+                action, file1, file2 = fields + ['']
+            elif len(fields) >= 4 and '->' in fields:
+                action, file1, _, file2 = fields
+            else:
+                print(f'    Invalid line: {line}')
+                continue
+
+            print('    parse as: ', action, file1, file2)
+        except Exception as e:
+            print(f'    Invalid line: {line}, error: {e}')
+            continue
+
+def test_actions_parse(monkeypatch):
+    files = fcopy.parse_actions(valid)
+    assert len(files) == len(valid)
+    with pytest.raises(ValueError):
+        files = fcopy.parse_actions(invalid)
+

{pyutilscripts-0.3.0b0 → pyutilscripts-0.5.1}/tests/test_fcopy.py

@@ -23,6 +23,7 @@ def dircmp(dir1, dir2):
         len(result.left_only) == 0
         and len(result.right_only) == 0
         and len(result.diff_files) == 0 ):
+        print(f"Directory comparison failed: {result.left_only}, {result.right_only}, {result.diff_files}")
         return False
     for dir in result.common_dirs:
         if not dircmp(os.path.join(dir1, dir), os.path.join(dir2, dir)):
@@ -35,7 +36,7 @@ def test_update_list(monkeypatch, file_manifest):
 
 def test_copy_files_with_update_and_rename(monkeypatch, file_manifest):
     target = tempfile.mktemp()
-    monkeypatch.setattr(sys, "argv", ["fcopy.py", "-s", ".", "-l", file_manifest, "-t", target])
+    monkeypatch.setattr(sys, "argv", ["fcopy.py", "-s", ".", "-l", file_manifest, "-t", target, "-vv"])
     code = fcopy.main()
     assert code == 0
 
@@ -68,7 +69,7 @@ def test_update_list_with_filter(monkeypatch, file_manifest):
     called = {}
     def fake_read_file_filter(args):
         called['ok'] = True
-        return [re.compile(line) for line in ['^file.txt$', '^.+__pycache__.+$', '^\.git.+$']]
+        return [re.compile(line) for line in ['^file.txt$', '^.+?__pycache__.+$', '^\.git.+$']]
     monkeypatch.setattr("pyutilscripts.fcopy.read_file_filter", fake_read_file_filter)
     code = fcopy.main()
     assert code == 0
@@ -78,7 +79,7 @@ def test_update_list_with_filter(monkeypatch, file_manifest):
     right = fcopy.read_file_list(manifest)
     diff = set(left) - set(right)
     assert diff
-    assert 'file.txt' in diff
+    assert [f for f in diff if '__pycache__' in f]
     assert len(diff) > 2
 
 def test_copy_files_with_filter(monkeypatch, file_manifest):

pyutilscripts-0.3.0b0/PKG-INFO

@@ -1,55 +0,0 @@
-Metadata-Version: 2.4
-Name: pyutilscripts
-Version: 0.3.0b0
-Summary: PyUtilScripts 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。
-Author-email: Zero Kwok <zero.kwok@foxmail.com>
-License: MIT License
-Project-URL: Homepage, https://github.com/ZeroKwok/pyutilscripts
-Project-URL: Issues, https://github.com/ZeroKwok/pyutilscripts/issues
-Keywords: tools
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: termcolor
-Dynamic: license-file
-
-# **PyUtilScripts**  
-
-`PyUtilScripts` 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。  
-
-## **📜 脚本列表**  
-
-| 脚本名称 | 功能描述 | 示例用法 |
-|----------|---------|---------|
-| [`fcopy.py`](fcopy.py) | 基于清单文件的复制工具 | `fcopy -l list.txt -s src_dir -d dest_dir` |
-| [`forward-tcp.py`](forward-tcp.py) | TCP 端口转发工具 | `forward-tcp -s 0.0.0.0:8081 -d 127.0.0.1:1081` |
-| [`prunedirs.py`](prunedirs.py) | 递归删除空目录 | `prunedirs /path/to/dir` |
-
----
-
-## **⚙️ 安装与使用**  
-
-### **1. 克隆仓库**  
-
-```bash
-git clone https://github.com/ZeroKwok/PyUtilScripts.git
-cd PyUtilScripts
-```
-
-### **2. 直接运行（无需安装）**  
-
-所有脚本均可直接执行：  
-
-```bash
-python3 script_name.py [args]
-```

pyutilscripts-0.3.0b0/README.md

@@ -1,30 +0,0 @@
-# **PyUtilScripts**  
-
-`PyUtilScripts` 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。  
-
-## **📜 脚本列表**  
-
-| 脚本名称 | 功能描述 | 示例用法 |
-|----------|---------|---------|
-| [`fcopy.py`](fcopy.py) | 基于清单文件的复制工具 | `fcopy -l list.txt -s src_dir -d dest_dir` |
-| [`forward-tcp.py`](forward-tcp.py) | TCP 端口转发工具 | `forward-tcp -s 0.0.0.0:8081 -d 127.0.0.1:1081` |
-| [`prunedirs.py`](prunedirs.py) | 递归删除空目录 | `prunedirs /path/to/dir` |
-
----
-
-## **⚙️ 安装与使用**  
-
-### **1. 克隆仓库**  
-
-```bash
-git clone https://github.com/ZeroKwok/PyUtilScripts.git
-cd PyUtilScripts
-```
-
-### **2. 直接运行（无需安装）**  
-
-所有脚本均可直接执行：  
-
-```bash
-python3 script_name.py [args]
-```

pyutilscripts-0.3.0b0/pyutilscripts.egg-info/PKG-INFO

@@ -1,55 +0,0 @@
-Metadata-Version: 2.4
-Name: pyutilscripts
-Version: 0.3.0b0
-Summary: PyUtilScripts 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。
-Author-email: Zero Kwok <zero.kwok@foxmail.com>
-License: MIT License
-Project-URL: Homepage, https://github.com/ZeroKwok/pyutilscripts
-Project-URL: Issues, https://github.com/ZeroKwok/pyutilscripts/issues
-Keywords: tools
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: termcolor
-Dynamic: license-file
-
-# **PyUtilScripts**  
-
-`PyUtilScripts` 是一个基于 Python 的通用小工具集合，目标是提供编写通用任务的辅助工具。  
-
-## **📜 脚本列表**  
-
-| 脚本名称 | 功能描述 | 示例用法 |
-|----------|---------|---------|
-| [`fcopy.py`](fcopy.py) | 基于清单文件的复制工具 | `fcopy -l list.txt -s src_dir -d dest_dir` |
-| [`forward-tcp.py`](forward-tcp.py) | TCP 端口转发工具 | `forward-tcp -s 0.0.0.0:8081 -d 127.0.0.1:1081` |
-| [`prunedirs.py`](prunedirs.py) | 递归删除空目录 | `prunedirs /path/to/dir` |
-
----
-
-## **⚙️ 安装与使用**  
-
-### **1. 克隆仓库**  
-
-```bash
-git clone https://github.com/ZeroKwok/PyUtilScripts.git
-cd PyUtilScripts
-```
-
-### **2. 直接运行（无需安装）**  
-
-所有脚本均可直接执行：  
-
-```bash
-python3 script_name.py [args]
-```

pyutilscripts-0.3.0b0/pyutilscripts.egg-info/requires.txt

@@ -1 +0,0 @@
-termcolor