9c8b2c9c9e
DB review found four DateTime columns defaulting to db.func.now() (MySQL session-timezone wall clock) while the rest of the schema stores naive UTC, so one schema mixed two clocks and to_dict() labelled the local values UTC with a 'Z' suffix. Switch application.dateadded, computers.installeddate, knowledgebase.lastupdated (default + onupdate), and slides.uploadeddate to the module-level naive-UTC _utcnow callable already used elsewhere (apitoken.py). ORM-side default only - no column-type change, no data migration; affects new/updated rows. Targeted tests pass (154); naming + pyflakes green. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
43 lines
1.5 KiB
Python
43 lines
1.5 KiB
Python
"""Slide model for the TV dashboard / screensaver slideshows."""
|
|
|
|
from datetime import datetime, timezone
|
|
|
|
from shopdb.api import db
|
|
|
|
|
|
def _utcnow():
|
|
# naive UTC to match the other DB DateTime columns (stored without tzinfo)
|
|
return datetime.now(timezone.utc).replace(tzinfo=None)
|
|
|
|
|
|
class TvSlide(db.Model):
|
|
"""One slide image in a surface's playlist.
|
|
|
|
Image files live on disk at instance/slides/<surface>/<filename>; this row
|
|
holds the play order + per-slide duration. Files are the source of truth for
|
|
existence - rows whose file is gone are ignored and pruned.
|
|
"""
|
|
__tablename__ = 'tvslides'
|
|
|
|
slideid = db.Column(db.Integer, primary_key=True)
|
|
surface = db.Column(db.String(20), nullable=False, index=True)
|
|
filename = db.Column(db.String(255), nullable=False)
|
|
sortorder = db.Column(db.Integer, default=0, nullable=False)
|
|
seconds = db.Column(db.Integer, default=0, nullable=False) # 0 = use default interval
|
|
uploadeddate = db.Column(db.DateTime, default=_utcnow)
|
|
|
|
# No DB-level unique on (surface, filename): utf8mb4 pushes that index past
|
|
# MySQL 5.6's 767-byte limit. Upload unique-renames, so dupes can't occur.
|
|
__table_args__ = (
|
|
db.Index('idx_tvslide_surface', 'surface'),
|
|
)
|
|
|
|
def to_dict(self):
|
|
return {
|
|
'slideid': self.slideid,
|
|
'surface': self.surface,
|
|
'filename': self.filename,
|
|
'sortorder': self.sortorder,
|
|
'seconds': self.seconds,
|
|
}
|