mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-25 18:40:06 -04:00
SQLAlchemy 1.3 has been end-of-life since 2021, and alembic was held at 1.10
because newer releases need SQLAlchemy 2. This is a mechanical port; the code
stays synchronous.
- SQLAlchemy[asyncio]==2.0.54, alembic==1.20.0.
- Model annotations use Mapped[...] (2.0 rejects bare annotations on mapped
attributes); declarative_base moves to sqlalchemy.orm.
- Plain SQL strings go through text() or exec_driver_sql; schema_ddl.execute_sql
accepts a SQLAlchemy Connection or a raw sqlite3 connection, so rebuild_fts
works from the baseline migration again.
- Session.get replaces Query.get; session.in_transaction() replaces
session.transaction; cache_ok on MediaPathType and FancyJSON.
- The tag-directory sync query joins through TagFile's relationships instead of
the legacy two-entity outerjoin.
- Section-hint rows use attribute access (2.0 rows are tuples).
- Migrations run on an AUTOCOMMIT connection, matching 1.3, where each
statement committed on its own. 2.0 autobegins, so the unique-stem
migration's read snapshot could not become a writer after its helpers wrote
on another connection ("database is locked"). The begin listener emits no
BEGIN for AUTOCOMMIT connections.
- Newer alembic compares column types: WrolpiKV now describes the TEXT table
its migration created.
- The test database installs its DDL inside engine.begin(); 2.0 connections
no longer autocommit, so the FTS tables were rolled back.
- Dependabot now holds SQLAlchemy at 2.0 instead of 1.3.
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
169 lines
6.1 KiB
Python
169 lines
6.1 KiB
Python
import pathlib
|
|
from typing import Optional
|
|
|
|
from sqlalchemy import Column, Integer, BigInteger, ForeignKey, String, Text, Index, or_
|
|
from sqlalchemy.orm import Mapped, relationship, Session, joinedload
|
|
|
|
from wrolpi.common import ModelHelper, Base
|
|
from wrolpi.db import get_db_session, serializer
|
|
from wrolpi.files.models import FileGroup
|
|
|
|
EPUB_MIMETYPE = 'application/epub'
|
|
MOBI_MIMETYPE = 'application/x-mobipocket-ebook'
|
|
|
|
DOC_MIMETYPES = (
|
|
'application/epub+zip',
|
|
'application/x-mobipocket-ebook',
|
|
'application/pdf',
|
|
'application/msword',
|
|
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
|
'application/vnd.oasis.opendocument.text',
|
|
'application/vnd.comicbook-rar',
|
|
'application/vnd.comicbook+zip',
|
|
'application/x-cbz',
|
|
'application/x-cbr',
|
|
'application/x-cbt',
|
|
'application/x-cb7',
|
|
)
|
|
|
|
# Mimetypes that are considered ebook formats.
|
|
EBOOK_MIMETYPES = (
|
|
EPUB_MIMETYPE,
|
|
MOBI_MIMETYPE,
|
|
)
|
|
|
|
|
|
COMIC_BOOK_SUFFIXES = ('.cbz', '.cbr', '.cbt', '.cb7')
|
|
|
|
|
|
def mimetype_is_doc(mimetype: str) -> bool:
|
|
"""Check if a mimetype is a doc type that the Doc model handles."""
|
|
return any(mimetype.startswith(mt) for mt in DOC_MIMETYPES)
|
|
|
|
|
|
class Doc(ModelHelper, Base):
|
|
__tablename__ = 'doc'
|
|
__table_args__ = (
|
|
Index('doc_size_idx', 'size'),
|
|
)
|
|
|
|
id = Column(Integer, primary_key=True)
|
|
size = Column(BigInteger)
|
|
publisher = Column(String)
|
|
language = Column(String)
|
|
page_count = Column(Integer)
|
|
subject = Column(String)
|
|
description = Column(Text)
|
|
|
|
file_group_id = Column(BigInteger, ForeignKey('file_group.id', ondelete='CASCADE'), nullable=False, unique=True)
|
|
file_group: Mapped[FileGroup] = relationship('FileGroup')
|
|
sections = relationship('DocSection', back_populates='doc',
|
|
cascade='all, delete-orphan',
|
|
passive_deletes=True)
|
|
|
|
def __repr__(self):
|
|
path = str(self.file_group.primary_path) if self.file_group else 'None'
|
|
return f'<Doc id={self.id} path={repr(path)} file_group_id={self.file_group_id}>'
|
|
|
|
@staticmethod
|
|
def json_options() -> tuple:
|
|
"""Loader options for a query whose Docs will be serialized: `__json__` reads the FileGroup and its Tags."""
|
|
return joinedload(Doc.file_group).selectinload(FileGroup.tag_files),
|
|
|
|
@serializer
|
|
def __json__(self) -> dict:
|
|
d = self.file_group.__json__()
|
|
if d.get('data') and d['data'].get('doc_path'):
|
|
d['data']['doc_path'] = self.file_group.resolve_path(d['data']['doc_path'])
|
|
if d.get('data') and d['data'].get('cover_path'):
|
|
d['data']['cover_path'] = self.file_group.resolve_path(d['data']['cover_path'])
|
|
# Also handle legacy ebook_path key.
|
|
if d.get('data') and d['data'].get('ebook_path'):
|
|
d['data']['ebook_path'] = self.file_group.resolve_path(d['data']['ebook_path'])
|
|
return d
|
|
|
|
@staticmethod
|
|
def get_by_path(session: Session, path) -> Optional['Doc']:
|
|
return session.query(Doc).join(FileGroup).filter(FileGroup.primary_path == str(path)).one_or_none()
|
|
|
|
@staticmethod
|
|
def can_model(file_group: FileGroup) -> bool:
|
|
if file_group.mimetype and mimetype_is_doc(file_group.mimetype):
|
|
return True
|
|
if file_group.primary_path and file_group.primary_path.suffix.lower() in COMIC_BOOK_SUFFIXES:
|
|
return True
|
|
return False
|
|
|
|
@staticmethod
|
|
def do_model(session: Session, file_group: FileGroup) -> 'Doc':
|
|
from modules.docs import _model_doc
|
|
doc = _model_doc(file_group, session)
|
|
file_group.model = Doc.__tablename__
|
|
file_group.indexed = True
|
|
return doc
|
|
|
|
@property
|
|
def cover_file(self) -> Optional[dict]:
|
|
posters = self.file_group.my_poster_files()
|
|
if posters:
|
|
return posters[0]
|
|
return None
|
|
|
|
@property
|
|
def cover_path(self) -> Optional[pathlib.Path]:
|
|
cover = self.cover_file
|
|
if cover:
|
|
return cover['path']
|
|
return None
|
|
|
|
def _hide_calibre_files(self, file_group: FileGroup):
|
|
"""Delete FileGroups of the cover/metadata when this is a Calibre ebook directory."""
|
|
from modules.docs.lib import discover_calibre_cover
|
|
path = file_group.primary_path
|
|
if not discover_calibre_cover(path):
|
|
raise ValueError(f'Refusing to hide Calibre files when we do not have a Calibre ebook directory!')
|
|
|
|
metadata = path.parent / 'metadata.opf'
|
|
cover = path.parent / 'cover.jpg'
|
|
|
|
with get_db_session(commit=True) as session:
|
|
file_groups = session.query(FileGroup).filter(or_(
|
|
FileGroup.primary_path == str(metadata),
|
|
FileGroup.primary_path == str(cover),
|
|
))
|
|
for fg in file_groups:
|
|
session.delete(fg)
|
|
|
|
|
|
# Section kinds.
|
|
SECTION_KIND_EPUB_SPINE = 'epub_spine'
|
|
SECTION_KIND_PDF_PAGE = 'pdf_page'
|
|
|
|
|
|
class DocSection(ModelHelper, Base):
|
|
"""A searchable sub-range of a Doc.
|
|
|
|
For EPUB files, one row per spine item with `ordinal` as the 0-based spine index.
|
|
For PDF files, one row per page with `ordinal` as the 1-based page number.
|
|
Each row is indexed by the `doc_section_fts` FTS5 table for per-section full-text search,
|
|
which lets us deep-link from a search result into a specific chapter or page.
|
|
"""
|
|
__tablename__ = 'doc_section'
|
|
__table_args__ = (
|
|
Index('doc_section_doc_id_idx', 'doc_id', 'ordinal'),
|
|
)
|
|
|
|
# SQLite requires exactly "INTEGER PRIMARY KEY" for the rowid alias (FTS5 content_rowid).
|
|
id = Column(BigInteger().with_variant(Integer, 'sqlite'), primary_key=True)
|
|
doc_id = Column(Integer, ForeignKey('doc.id', ondelete='CASCADE'), nullable=False)
|
|
kind = Column(String, nullable=False)
|
|
ordinal = Column(Integer, nullable=False)
|
|
label = Column(String)
|
|
# Full-text search over `content` is provided by the external-content FTS5 table
|
|
# `doc_section_fts` (see `wrolpi.fts`).
|
|
content = Column(Text)
|
|
|
|
doc = relationship('Doc', back_populates='sections')
|
|
|
|
def __repr__(self):
|
|
return f'<DocSection id={self.id} doc_id={self.doc_id} kind={self.kind} ordinal={self.ordinal}>'
|