datasette-scan 0.1__tar.gz → 0.1.1__tar.gz

{datasette_scan-0.1 → datasette_scan-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datasette-scan
-Version: 0.1
+Version: 0.1.1
 Summary: Datasette plugin for scanning for SQLite files
 Author: Simon Willison
 License-Expression: Apache-2.0

{datasette_scan-0.1 → datasette_scan-0.1.1}/datasette_scan/__init__.py

@@ -12,16 +12,19 @@ import time
 import sqlite_scanner
 
 
-def validate_databases(paths):
+def validate_databases(paths, nolock=False):
     """Check each path is a readable SQLite database.
 
     Returns (valid, skipped) where skipped is a list of (path, reason) tuples.
     """
     valid = []
     skipped = []
+    qs = "?mode=ro"
+    if nolock:
+        qs += "&nolock=1"
     for path in paths:
         try:
-            conn = sqlite3.connect(f"file:{path}?mode=ro", uri=True)
+            conn = sqlite3.connect(f"file:{path}{qs}", uri=True)
             try:
                 conn.execute("SELECT * FROM sqlite_master")
                 valid.append(path)
@@ -39,18 +42,14 @@ def scan_directories(directories):
     """
     binary = sqlite_scanner.get_binary_path()
     if not os.path.exists(binary):
-        raise click.ClickException(
-            f"sqlite-scanner binary not found at {binary}"
-        )
+        raise click.ClickException(f"sqlite-scanner binary not found at {binary}")
     result = subprocess.run(
         [binary, "--jsonl"] + list(directories),
         capture_output=True,
         text=True,
     )
     if result.returncode != 0:
-        raise click.ClickException(
-            f"sqlite-scanner failed: {result.stderr.strip()}"
-        )
+        raise click.ClickException(f"sqlite-scanner failed: {result.stderr.strip()}")
     paths = []
     for line in result.stdout.strip().splitlines():
         if line:
@@ -117,11 +116,9 @@ def register_commands(cli):
 
         # Validate scanned files, skip corrupted ones
         if scanned_files:
-            valid, skipped = validate_databases(scanned_files)
+            valid, skipped = validate_databases(scanned_files, nolock=True)
             for path, reason in skipped:
-                click.echo(
-                    f"Skipping {path}: {reason}", err=True
-                )
+                click.echo(f"Skipping {path}: {reason}", err=True)
             db_files.extend(valid)
 
         # Always use nolock for safety with discovered files

{datasette_scan-0.1 → datasette_scan-0.1.1}/datasette_scan.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datasette-scan
-Version: 0.1
+Version: 0.1.1
 Summary: Datasette plugin for scanning for SQLite files
 Author: Simon Willison
 License-Expression: Apache-2.0

{datasette_scan-0.1 → datasette_scan-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datasette-scan"
-version = "0.1"
+version = "0.1.1"
 description = "Datasette plugin for scanning for SQLite files"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]

{datasette_scan-0.1 → datasette_scan-0.1.1}/tests/test_scan.py

@@ -2,7 +2,11 @@ import click
 from click.testing import CliRunner
 from datasette.app import Datasette
 from datasette.cli import cli
-from datasette_scan import scan_directories, rescan_and_add_databases, validate_databases
+from datasette_scan import (
+    scan_directories,
+    rescan_and_add_databases,
+    validate_databases,
+)
 import json
 import os
 import pytest
@@ -50,9 +54,7 @@ def test_scan_has_serve_options():
     serve_option_names = {
         p.name for p in serve_cmd.params if isinstance(p, click.Option)
     }
-    scan_option_names = {
-        p.name for p in scan_cmd.params if isinstance(p, click.Option)
-    }
+    scan_option_names = {p.name for p in scan_cmd.params if isinstance(p, click.Option)}
     # All serve options except nolock should be present on scan
     # nolock is always enabled for scan and not exposed as an option
     missing = serve_option_names - scan_option_names - {"nolock"}
@@ -62,9 +64,7 @@ def test_scan_has_serve_options():
 def test_scan_has_scan_interval_option():
     """scan should have the --scan-interval option that serve doesn't."""
     scan_cmd = cli.commands["scan"]
-    scan_option_names = {
-        p.name for p in scan_cmd.params if isinstance(p, click.Option)
-    }
+    scan_option_names = {p.name for p in scan_cmd.params if isinstance(p, click.Option)}
     assert "scan_interval" in scan_option_names
 
 
@@ -80,9 +80,7 @@ def test_scan_directories_finds_sqlite_files(tmp_with_dbs):
 def test_scan_default_scans_current_directory(tmp_with_dbs):
     """With no args, scan should scan the current directory."""
     runner = CliRunner()
-    result = runner.invoke(
-        cli, ["scan", "--get", "/.json"], catch_exceptions=False
-    )
+    result = runner.invoke(cli, ["scan", "--get", "/.json"], catch_exceptions=False)
     # We just need it to not error - with no SQLite in cwd it may serve
     # empty but should not crash
     assert result.exit_code == 0