lkjlkj

cmdlets/merge_file.py

@@ -12,7 +12,7 @@ from models import DownloadOptions
 from config import resolve_output_dir
 import subprocess as _subprocess
 import shutil as _shutil
-from ._shared import parse_cmdlet_args
+from ._shared import create_pipe_object_result, parse_cmdlet_args
 
 try:
     from PyPDF2 import PdfWriter, PdfReader
@@ -136,35 +136,12 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
         if target_path and target_path.exists():
             source_files.append(target_path)
 			
-            # Track the .tags file for this source
-            tags_file = target_path.with_suffix(target_path.suffix + '.tags')
+            # Track the .tag file for this source
+            tags_file = target_path.with_suffix(target_path.suffix + '.tag')
             if tags_file.exists():
                 source_tags_files.append(tags_file)
-				
-                # Try to read hash, tags, url, and relationships from .tags sidecar file
                 try:
-                    tags_content = tags_file.read_text(encoding='utf-8')
-                    for line in tags_content.split('\n'):
-                        line = line.strip()
-                        if not line:
-                            continue
-                        if line.startswith('hash:'):
-                            hash_value = line[5:].strip()
-                            if hash_value:
-                                source_hashes.append(hash_value)
-                        elif line.startswith('url:') or line.startswith('url:'):
-                            # Extract url from tags file
-                            url_value = line.split(':', 1)[1].strip() if ':' in line else ''
-                            if url_value and url_value not in source_url:
-                                source_url.append(url_value)
-                        elif line.startswith('relationship:'):
-                            # Extract relationships from tags file
-                            rel_value = line.split(':', 1)[1].strip() if ':' in line else ''
-                            if rel_value and rel_value not in source_relationships:
-                                source_relationships.append(rel_value)
-                        else:
-                            # Collect actual tags (not metadata like hash: or url:)
-                            source_tags.append(line)
+                    source_tags.extend(read_tags_from_file(tags_file) if HAS_METADATA_API else [])
                 except Exception:
                     pass
 			
@@ -254,8 +231,8 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
     
     log(f"Merged {len(source_files)} files into: {output_path}", file=sys.stderr)
     
-    # Create .tags sidecar file for the merged output using unified API
-    tags_path = output_path.with_suffix(output_path.suffix + '.tags')
+    # Create .tag sidecar file for the merged output using unified API
+    tags_path = output_path.with_suffix(output_path.suffix + '.tag')
     try:
         # Start with title tag
         merged_tags = [f"title:{output_path.stem}"]
@@ -312,29 +289,20 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
     except Exception as e:
         log(f"Warning: Could not create sidecar: {e}", file=sys.stderr)
     
-    # Emit PipelineItem so the merged file can be piped to next command
+    # Emit a PipeObject-compatible dict so the merged file can be piped to next command
     try:
-        # Try to import PipelineItem from downlow module
-        try:
-            from downlow import PipelineItem
-        except ImportError:
-            # Fallback: create a simple object with the required attributes
-            class SimpleItem:
-                def __init__(self, target, title, media_kind, tags=None, url=None):
-                    self.target = target
-                    self.title = title
-                    self.media_kind = media_kind
-                    self.tags = tags or []
-                    self.url = url or []
-                    self.store = "local"
-            PipelineItem = SimpleItem
-        
-        merged_item = PipelineItem(
-            target=str(output_path),
+        from SYS.utils import sha256_file
+        merged_hash = sha256_file(output_path)
+        merged_item = create_pipe_object_result(
+            source="local",
+            identifier=output_path.name,
+            file_path=str(output_path),
+            cmdlet_name="merge-file",
             title=output_path.stem,
+            hash_value=merged_hash,
+            tag=merged_tags,
+            url=source_url,
             media_kind=file_kind,
-            tags=merged_tags,  # Include merged tags
-            url=source_url  # Include known url
         )
         # Clear previous results to ensure only the merged file is passed down
         ctx.clear_last_result()
@@ -348,7 +316,7 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
     # Always delete source files if they were downloaded playlist items (temp files)
     # We can detect this if they are in the temp download directory or if we tracked them
     if delete_after or True: # Force delete for now as merge consumes them
-        # First delete all .tags files
+        # First delete all .tag files
         for tags_file in source_tags_files:
             try:
                 tags_file.unlink()
@@ -490,8 +458,8 @@ def _merge_audio(files: List[Path], output: Path, output_format: str) -> bool:
             title = file_path.stem  # Default to filename without extension
             if HAS_METADATA_API:
                 try:
-                    # Try to read tags from .tags sidecar file
-                    tags_file = file_path.with_suffix(file_path.suffix + '.tags')
+                    # Try to read tags from .tag sidecar file
+                    tags_file = file_path.with_suffix(file_path.suffix + '.tag')
                     if tags_file.exists():
                         tags = read_tags_from_file(tags_file)
                         if tags: