docker-diff 0.0.8__py3-none-any.whl → 0.0.9__py3-none-any.whl

{docker_diff-0.0.8.dist-info → docker_diff-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docker-diff
-Version: 0.0.8
+Version: 0.0.9
 Summary: Docker Image Comparison Database Manager
 License: This is free and unencumbered software released into the public domain.
         

docker_diff-0.0.9.dist-info/RECORD

@@ -0,0 +1,10 @@
+docker_diff-0.0.9.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+docker_diff_pkg/__init__.py,sha256=aG5WUO74Z5ax04A5iwh6thCpHcFXBsdH5v-ph-uUJuI,321
+docker_diff_pkg/_version.py,sha256=X2FLFwBoUmgJPsOV-1l-SxIXNSTX1TQ036Kf2j9Mc68,704
+docker_diff_pkg/cli.py,sha256=zrUzf36Ld1HWW1jVneO6COnes7EOszw6ibUAUjIleyg,24989
+docker_diff_pkg/schema.sql,sha256=xI3kOohbUEzwFhmIGQs2_abN_tJn1BBdAya7tVbw6n8,5477
+docker_diff-0.0.9.dist-info/METADATA,sha256=xZxoN25AcmUNEq1YZ9R5w5DWAnvc6qo0H0PfSTX9iu0,4549
+docker_diff-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+docker_diff-0.0.9.dist-info/entry_points.txt,sha256=nEDTWZsgB5fRJgeXHJbXJyaHKMmKyN9Qypf3X78tosw,57
+docker_diff-0.0.9.dist-info/top_level.txt,sha256=GB5Qrc3AH1pk0543cQz9SRNr5Fatrj-c0Cdp3rCvTM8,16
+docker_diff-0.0.9.dist-info/RECORD,,

docker_diff_pkg/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.8'
-__version_tuple__ = version_tuple = (0, 0, 8)
+__version__ = version = '0.0.9'
+__version_tuple__ = version_tuple = (0, 0, 9)
 
 __commit_id__ = commit_id = None

docker_diff_pkg/cli.py

@@ -222,25 +222,103 @@ class DockerImageDB:
         
         # Get file listing using docker run
         try:
-            result = subprocess.run([
-                'docker', 'run', '--rm', image_name, 
-                'find', '/', '-type', 'f', '-exec', 'stat', '-c', '%n|%s|%Y', '{}', ';'
-            ], capture_output=True, text=True)
-            
-            files = []
-            for line in result.stdout.strip().split('\n'):
-                if '|' in line:
-                    parts = line.split('|')
-                    if len(parts) >= 3:
-                        files.append({
-                            'path': parts[0],
-                            'size': int(parts[1]) if parts[1].isdigit() else 0,
-                            'mtime': int(parts[2]) if parts[2].isdigit() else None
-                        })
-            
-            self.add_files_for_image(image_id, files)
-            print(f"  Stored {len(files)} files for {image_name}")
-            return image_id
+            # Stream file listing using Docker SDK if available; fallback to streaming subprocess
+            # Clear existing files first (we'll insert incrementally)
+            self._exec("DELETE FROM files WHERE image_id = ?", (image_id,))
+
+            insert_sql = """
+                INSERT INTO files 
+                (image_id, file_path, file_size, file_mode, modified_time, file_type, checksum)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
+            """
+
+            batch: List[Tuple[Any, ...]] = []
+            batch_size = 500
+            inserted = 0
+
+            def flush_batch():
+                nonlocal batch, inserted
+                if batch:
+                    self._executemany(insert_sql, batch)
+                    inserted += len(batch)
+                    batch = []
+                    if inserted % 1000 == 0:
+                        print(f"  Discovered {inserted} files...", flush=True)
+
+            def parse_line(line: str):
+                parts = line.strip().split("|")
+                if len(parts) >= 3:
+                    path = parts[0]
+                    size = int(parts[1]) if parts[1].isdigit() else 0
+                    mtime = int(parts[2]) if parts[2].isdigit() else None
+                    batch.append((image_id, path, size, None, mtime, "file", None))
+                    if len(batch) >= batch_size:
+                        flush_batch()
+
+            cmd = ['find', '/', '-type', 'f', '-exec', 'stat', '-c', '%n|%s|%Y', '{}', ';']
+
+            try:
+                try:
+                    import docker  # type: ignore
+                    client = docker.from_env()
+                    # Ensure image is available; pull only if not present
+                    try:
+                        client.images.get(image_name)
+                    except Exception:
+                        client.images.pull(image_name)
+
+                    container = client.containers.create(image=image_name, command=cmd, detach=True)
+                    try:
+                        container.start()
+                        remainder = ""
+                        for chunk in container.logs(stream=True, stdout=True, stderr=False, follow=True):
+                            if not chunk:
+                                continue
+                            text = chunk.decode("utf-8", errors="ignore")
+                            remainder += text
+                            while True:
+                                nl = remainder.find("\n")
+                                if nl == -1:
+                                    break
+                                line = remainder[:nl]
+                                remainder = remainder[nl + 1 :]
+                                if line:
+                                    parse_line(line)
+                        if remainder.strip():
+                            parse_line(remainder.strip())
+                        flush_batch()
+                    finally:
+                        try:
+                            container.remove(force=True)
+                        except Exception:
+                            pass
+
+                    print(f"  Stored {inserted} files for {image_name}")
+                    return image_id
+
+                except Exception as docker_err:
+                    # Fallback to streaming via subprocess
+                    proc = subprocess.Popen(
+                        ['docker', 'run', '--rm', image_name, *cmd],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                        bufsize=1,
+                    )
+                    assert proc.stdout is not None
+                    for line in proc.stdout:
+                        if line:
+                            parse_line(line)
+                    proc.wait()
+                    if proc.returncode != 0:
+                        err = (proc.stderr.read() if proc.stderr else "").strip()
+                        raise subprocess.SubprocessError(err or f"docker run exited with {proc.returncode}")
+                    flush_batch()
+                    print(f"  Stored {inserted} files for {image_name}")
+                    return image_id
+
+            except Exception as e:
+                raise subprocess.SubprocessError(str(e))
             
         except subprocess.SubprocessError as e:
             print(f"Error scanning {image_name}: {e}")

docker_diff-0.0.8.dist-info/RECORD

@@ -1,10 +0,0 @@
-docker_diff-0.0.8.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-docker_diff_pkg/__init__.py,sha256=aG5WUO74Z5ax04A5iwh6thCpHcFXBsdH5v-ph-uUJuI,321
-docker_diff_pkg/_version.py,sha256=j-ar4gJGiWIawqKXhvv9hGJWLfwu0tISl-0GV97B7a0,704
-docker_diff_pkg/cli.py,sha256=C6LYpgFGmiZsBZ8MO4TJKmtKMvg1EqB6qYlpilbq6pI,21549
-docker_diff_pkg/schema.sql,sha256=xI3kOohbUEzwFhmIGQs2_abN_tJn1BBdAya7tVbw6n8,5477
-docker_diff-0.0.8.dist-info/METADATA,sha256=7B6M1QDA_F4YtmzjQduM7KTbmP4_6_P0ii-4QklOqNs,4549
-docker_diff-0.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-docker_diff-0.0.8.dist-info/entry_points.txt,sha256=nEDTWZsgB5fRJgeXHJbXJyaHKMmKyN9Qypf3X78tosw,57
-docker_diff-0.0.8.dist-info/top_level.txt,sha256=GB5Qrc3AH1pk0543cQz9SRNr5Fatrj-c0Cdp3rCvTM8,16
-docker_diff-0.0.8.dist-info/RECORD,,