Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .githooks/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ while read -r local_ref local_sha remote_ref remote_sha; do
branch="$(echo "$remote_ref" | sed 's|refs/heads/||')"
expected_local_ref="refs/heads/$branch"

if [ "$branch" != "dev" ] && [ "$branch" != "main" ]; then
echo "Blocked: refusing to push '$branch' to origin." >&2
echo "Push private branches to the 'private' remote instead." >&2
exit 1
fi

if [ "$local_ref" != "$expected_local_ref" ]; then
echo "Blocked: push local '$local_ref' to matching public branch '$branch' instead of rewriting refs." >&2
exit 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""

import sqlalchemy as sa

from alembic import op

revision = "r5s6t7u8v9w0"
Expand Down
46 changes: 46 additions & 0 deletions alembic/versions/s1t2u3v4w5x6_add_detected_books_table.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
"""Add detected_books table.

Revision ID: s1t2u3v4w5x6
Revises: r5s6t7u8v9w0
Create Date: 2026-04-05
"""

from typing import Sequence

import sqlalchemy as sa

from alembic import op

revision: str = "s1t2u3v4w5x6"
down_revision: str = "r5s6t7u8v9w0"
branch_labels: Sequence[str] | None = None
depends_on: str | None = None


def upgrade() -> None:
op.create_table(
"detected_books",
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("source", sa.String(length=50), nullable=False, server_default="abs"),
sa.Column("source_id", sa.String(length=255), nullable=False),
sa.Column("title", sa.String(length=500), nullable=True),
sa.Column("author", sa.String(length=500), nullable=True),
sa.Column("cover_url", sa.String(length=500), nullable=True),
sa.Column("progress_percentage", sa.Float(), nullable=False, server_default="0"),
sa.Column("first_detected_at", sa.DateTime(), nullable=True),
sa.Column("last_seen_at", sa.DateTime(), nullable=True),
sa.Column("status", sa.String(length=20), nullable=True, server_default="detected"),
sa.Column("matches_json", sa.Text(), nullable=True),
sa.Column("device", sa.String(length=128), nullable=True),
sa.Column("ebook_filename", sa.String(length=500), nullable=True),
sa.PrimaryKeyConstraint("id"),
sa.UniqueConstraint("source_id", "source", name="uq_detected_books_source_id_source"),
)
op.create_index("ix_detected_books_source", "detected_books", ["source"], unique=False)
op.create_index("ix_detected_books_status", "detected_books", ["status"], unique=False)


def downgrade() -> None:
op.drop_index("ix_detected_books_status", table_name="detected_books")
op.drop_index("ix_detected_books_source", table_name="detected_books")
op.drop_table("detected_books")
19 changes: 19 additions & 0 deletions alembic/versions/t9u0v1w2x3y4_merge_detected_books_head.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
"""merge detected books migration head

Revision ID: t9u0v1w2x3y4
Revises: 5308a8e2c930, s1t2u3v4w5x6
Create Date: 2026-04-05
"""

revision: str = "t9u0v1w2x3y4"
down_revision = ("5308a8e2c930", "s1t2u3v4w5x6")
branch_labels = None
depends_on = None


def upgrade() -> None:
pass


def downgrade() -> None:
pass
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ alembic==1.18.4
python-socketio[client]==5.16.1
h11==0.16.0
mkdocs-material==9.7.4
mistune==3.2.2
mistune==3.2.0
pytest-asyncio==1.3.0
41 changes: 20 additions & 21 deletions scripts/git/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,52 +5,51 @@ flow with repo-owned tooling.

## Branch Roles

- `dev`: public development branch on `origin`
- `main`: public release branch on `origin`
- `draft`: private unpublished branch on `private`
- `private/dev` and `private/main`: mirrors of the public branches
- `dev`: integration branch on `origin`
- `main`: release branch on `origin`
- feature branches: short-lived topic branches on `origin`, typically merged into `dev`

## First-Time Setup

```bash
scripts/git/install-hooks.sh
scripts/git/sanitize-public-branch.sh dev "chore: strip private-only files from dev"
scripts/git/sanitize-public-branch.sh main "chore: strip private-only files from main"
scripts/git/create-draft-branch.sh
git branch --track draft private/draft
scripts/git/setup-worktrees.sh
```

## Public-First Workflow
## Development Workflow

1. Work on `dev`
2. Push to `origin/dev`
3. Sync the private mirror:
3. Open a PR from `dev` to `main` when ready to release

```bash
scripts/git/sync-private-mirrors.sh dev
```
## Feature Branch Workflow

## Private-First Workflow

1. Work on `draft`
2. Push to `private/draft`
3. Promote a sanitized snapshot to `dev`
1. Create a branch from `dev`
2. Push the branch to `origin`
3. Open a PR into `dev`

```bash
scripts/git/promote.sh --push draft dev "feat: publish draft snapshot"
scripts/git/sync-private-mirrors.sh dev
git switch dev
git pull --ff-only origin dev
git switch -c my-feature
git push -u origin my-feature
```

## Release Workflow

1. Merge feature branches into `dev`
2. Push `dev`
3. Open a PR from `dev` to `main`

```bash
scripts/git/promote.sh --push dev main "release: vX.Y.Z"
scripts/git/sync-private-mirrors.sh main
git push origin dev
gh pr create --base main --head dev
```

## Safety Checks

- `config/private-paths.txt` defines what must never land on public branches
- `.githooks/pre-push` blocks non-public branches from pushing to `origin`
- `.githooks/pre-push` verifies any branch pushed to `origin` and prompts before direct pushes to `main`
- `scripts/git/verify-public-tree.sh` validates public branch content
76 changes: 0 additions & 76 deletions scripts/git/create-draft-branch.sh

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/git/promote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Usage:
scripts/git/promote.sh [--push] <source-branch> <dest-branch> [commit message]

Examples:
scripts/git/promote.sh draft dev "feat: publish draft snapshot"
scripts/git/promote.sh feature/my-change dev "feat: publish feature snapshot"
scripts/git/promote.sh --push dev main "release: v0.2.0"
EOF
}
Expand Down
7 changes: 1 addition & 6 deletions scripts/git/setup-worktrees.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ repo_name="$(basename "$repo_root")"

cd "$repo_root"

if ! git show-ref --verify --quiet refs/heads/draft && \
git show-ref --verify --quiet refs/remotes/private/draft; then
git branch --track draft private/draft >/dev/null 2>&1 || true
fi

active_branches="$(git worktree list --porcelain | awk '/^branch / {sub("^refs/heads/","",$2); print $2}')"

add_worktree() {
Expand All @@ -37,5 +32,5 @@ add_worktree() {
git worktree add "$target_dir" "$branch"
}

add_worktree draft "$parent_dir/$repo_name-draft"
add_worktree dev "$parent_dir/$repo_name-dev"
add_worktree main "$parent_dir/$repo_name-main"
98 changes: 0 additions & 98 deletions scripts/git/sync-private-mirrors.sh

This file was deleted.

Loading
Loading