dtoro
351ccd7bb4
Pick and add-to-heap were two ways of saying "I want to keep this
one". Merging them: P now toggles the selection's membership in the
active heap. The is_picked flag goes away (orphaned in the DB the
same way is_trashed was).
Backend
- Drop is_picked from PhotoBase / PhotoUpdate / PhotoResponse and
from the photos list filter param.
- Drop the is_picked Column from the Photo model (DB column stays
on legacy installs but is no longer read or written).
- Drop the bulk action 'pick' branch.
- New GET /heaps/{id}/photo_ids returns just the flat string list.
Used by the frontend for fast client-side membership lookups
without fetching full photo records.
Frontend
- New hooks/useActiveHeapMembersQuery.ts → returns
{ activeHeap, memberIds: Set<string> }. Subscribes once at the
Timeline level and passes a derived isInActiveHeap bool down to
each PhotoThumbnail (avoids hundreds of thumbnails subscribing
to the same query).
- PhotoThumbnail: replaces the old check-icon Pick affordance with
a clear basket badge in the bottom-right corner — a small filled
pick-colour pill containing a ShoppingBasket icon — visible only
when the photo belongs to the active heap.
- P shortcut (useKeyboardShortcuts) now toggles membership: if every
selected photo is already a member, it removes them; otherwise it
adds the missing ones. T binding removed (P fully replaces it).
- RightSidebar Pick button is now a Pick / Picked toggle bound to
the active heap. Disabled with a hint when no heap is active.
Shows the heap name in its title attr.
- filterStore drops 'picked' and 'unflagged' from FlagFilter.
FilterBar's flag dropdown is now just Any / Discarded.
- LeftSidebar drops the "Flagged" virtual node (it just set
flag=picked, which no longer exists).
- KeyboardHints: P → "Pick → heap".
- Photo TS type drops is_picked.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
78 lines
3.0 KiB
Python
78 lines
3.0 KiB
Python
"""
|
|
Photo model definition
|
|
"""
|
|
from sqlalchemy import Column, String, Integer, Boolean, DateTime, ForeignKey, Text, Index
|
|
from sqlalchemy.sql import func
|
|
from datetime import datetime
|
|
import uuid
|
|
|
|
from app.database import Base
|
|
|
|
class Photo(Base):
|
|
__tablename__ = 'photos'
|
|
|
|
# Primary key
|
|
id = Column(String, primary_key=True, default=lambda: str(uuid.uuid4()))
|
|
|
|
# File information
|
|
filepath = Column(String, unique=True, nullable=False)
|
|
filename = Column(String, nullable=False)
|
|
folder_id = Column(String, ForeignKey('folders.id'))
|
|
file_hash = Column(String, index=True) # SHA-256 hash for duplicate detection
|
|
|
|
# Media information
|
|
media_type = Column(String, nullable=False) # 'photo' | 'video' | 'raw' | 'heic'
|
|
original_format = Column(String) # 'CR3', 'NEF', 'HEIC', 'MP4', 'JPEG', etc.
|
|
width = Column(Integer)
|
|
height = Column(Integer)
|
|
file_size = Column(Integer)
|
|
|
|
# Timestamps
|
|
taken_at = Column(DateTime) # from EXIF DateTimeOriginal, fallback to file mtime
|
|
taken_at_source = Column(String) # 'exif' | 'filesystem' | 'manual'
|
|
added_at = Column(DateTime, server_default=func.now())
|
|
updated_at = Column(DateTime, onupdate=func.now())
|
|
|
|
# Discard status. The DB column names stay is_trashed/trashed_at to avoid
|
|
# a migration; only the Python attribute name reflects the rename.
|
|
is_discarded = Column('is_trashed', Boolean, default=False)
|
|
discarded_at = Column('trashed_at', DateTime)
|
|
|
|
# Thumbnail paths
|
|
thumb_small = Column(String) # path to 240px thumb
|
|
thumb_medium = Column(String) # path to 640px thumb
|
|
thumb_large = Column(String) # path to 1280px thumb
|
|
|
|
# Processing status
|
|
processing_status = Column(String, default='pending') # 'pending' | 'processing' | 'completed' | 'failed'
|
|
processing_error = Column(Text)
|
|
|
|
# Metadata
|
|
exif_json = Column(Text) # full EXIF/XMP blob as JSON
|
|
|
|
# User-editable fields
|
|
user_title = Column(String)
|
|
user_notes = Column(Text)
|
|
rating = Column(Integer, default=0) # 0-5 stars
|
|
color_label = Column(String) # 'red'|'orange'|'yellow'|'green'|'blue'|'purple'|NULL
|
|
# Note: is_rejected was merged into is_discarded (a single soft "discarded"
|
|
# concept). is_picked was unified with active-heap membership — picking a
|
|
# photo just means adding it to the active heap. Both DB columns may still
|
|
# exist on legacy installs but are no longer read or written.
|
|
|
|
# Duplicate detection
|
|
is_duplicate = Column(Boolean, default=False)
|
|
|
|
# Live photo support
|
|
live_photo_video_id = Column(String, ForeignKey('photos.id'))
|
|
|
|
# Indexes for performance
|
|
__table_args__ = (
|
|
Index('ix_photos_taken_at', 'taken_at'),
|
|
Index('ix_photos_folder_id', 'folder_id'),
|
|
Index('ix_photos_is_trashed', 'is_trashed'),
|
|
Index('ix_photos_rating', 'rating'),
|
|
Index('ix_photos_color_label', 'color_label'),
|
|
Index('ix_photos_media_type', 'media_type'),
|
|
Index('ix_photos_processing_status', 'processing_status'),
|
|
) |