diff --git a/alembic/versions/365c985893b8_ebook_creator.py b/alembic/versions/365c985893b8_ebook_creator.py new file mode 100644 index 00000000..00a9b48d --- /dev/null +++ b/alembic/versions/365c985893b8_ebook_creator.py @@ -0,0 +1,49 @@ +"""eBook creator. + +Revision ID: 365c985893b8 +Revises: 5ad9efbf3570 +Create Date: 2023-10-29 16:54:28.319427 + +""" +import os + +from alembic import op +from sqlalchemy.orm import Session + +# revision identifiers, used by Alembic. +revision = '365c985893b8' +down_revision = '5ad9efbf3570' +branch_labels = None +depends_on = None + +DOCKERIZED = True if os.environ.get('DOCKER', '').lower().startswith('t') else False + + +def upgrade(): + bind = op.get_bind() + session = Session(bind=bind) + + session.execute(''' + UPDATE file_group + SET author=creator + FROM ebook + WHERE ebook.file_group_id = file_group.id + ''') + session.execute('DROP INDEX IF EXISTS ebook_creator_idx') + session.execute('ALTER TABLE ebook DROP COLUMN IF EXISTS creator') + + +def downgrade(): + bind = op.get_bind() + session = Session(bind=bind) + + session.execute('ALTER TABLE ebook ADD COLUMN IF NOT EXISTS creator TEXT') + session.execute(''' + UPDATE ebook + SET creator=author + FROM file_group + WHERE + ebook.file_group_id = file_group.id + AND model = 'ebook' + ''') + session.execute('CREATE INDEX IF NOT EXISTS ebook_creator_idx ON ebook(creator)') diff --git a/alembic/versions/5ad9efbf3570_filegroup_length.py b/alembic/versions/5ad9efbf3570_filegroup_length.py new file mode 100644 index 00000000..c5b40b31 --- /dev/null +++ b/alembic/versions/5ad9efbf3570_filegroup_length.py @@ -0,0 +1,141 @@ +""" +Migrates Video.duration/.url/.viewed/Archive.url to FileGroup.length/.url/.viewed. + +Revision ID: 5ad9efbf3570 +Revises: 4b54ad052e2e +Create Date: 2023-10-24 09:25:33.818373 + +""" +import os + +from alembic import op +from sqlalchemy.orm import Session + +# revision identifiers, used by Alembic. +revision = '5ad9efbf3570' +down_revision = '4b54ad052e2e' +branch_labels = None +depends_on = None + +DOCKERIZED = True if os.environ.get('DOCKER', '').lower().startswith('t') else False + + +def upgrade(): + bind = op.get_bind() + session = Session(bind=bind) + + session.execute('ALTER TABLE file_group ADD COLUMN length INT DEFAULT 0') + session.execute(''' + UPDATE file_group + SET length=video.duration + FROM video + WHERE file_group.id = video.file_group_id + ''') + + # Migrate Archive.url and Video.url to FileGroup.url. + session.execute('ALTER TABLE file_group ADD COLUMN url TEXT') + session.execute(''' + UPDATE file_group + SET url=archive.url + FROM archive + WHERE file_group.id = archive.file_group_id + ''') + session.execute(''' + UPDATE file_group + SET url=video.url + FROM video + WHERE file_group.id = video.file_group_id + ''') + + # Migrate Archive.archive_datetime to FileGroup.download_datetime. + session.execute('ALTER TABLE file_group ADD COLUMN download_datetime TIMESTAMP WITH TIME ZONE') + session.execute(''' + UPDATE file_group + SET download_datetime=archive.archive_datetime + FROM archive + WHERE file_group.id = archive.file_group_id + ''') + + # Migrate Video.viewed to FileGroup.viewed. + session.execute('ALTER TABLE file_group ADD COLUMN viewed TIMESTAMP WITH TIME ZONE') + session.execute(''' + UPDATE file_group + SET viewed=video.viewed + FROM video + WHERE file_group.id = video.file_group_id + ''') + + session.execute('DROP INDEX IF EXISTS archive_archive_datetime_idx') + session.execute('DROP INDEX IF EXISTS archive_url_idx') + session.execute('DROP INDEX IF EXISTS video_url_idx') + session.execute('DROP INDEX IF EXISTS video_viewed_idx') + session.execute('ALTER TABLE archive DROP COLUMN IF EXISTS archive_datetime') + session.execute('ALTER TABLE archive DROP COLUMN IF EXISTS url') + session.execute('ALTER TABLE video DROP COLUMN IF EXISTS url') + session.execute('ALTER TABLE video DROP COLUMN IF EXISTS viewed') + + session.execute('CREATE INDEX file_group_download_datetime_idx ON file_group(download_datetime)') + session.execute('CREATE INDEX file_group_length_idx ON file_group(length)') + session.execute('CREATE INDEX file_group_url_idx ON file_group(url)') + session.execute('CREATE INDEX file_group_viewed_idx ON file_group(viewed)') + + +def downgrade(): + bind = op.get_bind() + session = Session(bind=bind) + + session.execute('ALTER TABLE video ADD COLUMN IF NOT EXISTS duration INTEGER') + session.execute(''' + UPDATE video + SET duration=file_group.length + FROM file_group + WHERE file_group.id = video.file_group_id + ''') + + session.execute('ALTER TABLE video ADD COLUMN IF NOT EXISTS url TEXT') + session.execute(''' + UPDATE video + SET url=file_group.url + FROM file_group + WHERE file_group.id = video.file_group_id + ''') + + # Video has `viewed`, Archive does not. + session.execute('ALTER TABLE video ADD COLUMN IF NOT EXISTS viewed TIMESTAMP WITH TIME ZONE') + session.execute(''' + UPDATE video + SET url=file_group.viewed + FROM file_group + WHERE file_group.id = video.file_group_id + ''') + + session.execute('ALTER TABLE archive ADD COLUMN IF NOT EXISTS url TEXT') + session.execute(''' + UPDATE archive + SET url=file_group.url + FROM file_group + WHERE file_group.id = archive.file_group_id + ''') + + session.execute('ALTER TABLE archive ADD COLUMN IF NOT EXISTS archive_datetime TIMESTAMP WITH TIME ZONE') + session.execute(''' + UPDATE archive + SET archive_datetime=file_group.download_datetime + FROM file_group + WHERE file_group.id = archive.file_group_id + ''') + + session.execute('ALTER TABLE file_group DROP COLUMN IF EXISTS download_datetime') + session.execute('ALTER TABLE file_group DROP COLUMN IF EXISTS length') + session.execute('ALTER TABLE file_group DROP COLUMN IF EXISTS url') + session.execute('ALTER TABLE file_group DROP COLUMN IF EXISTS viewed') + session.execute('DROP INDEX IF EXISTS file_group_download_datetime_idx') + session.execute('DROP INDEX IF EXISTS file_group_length_idx') + session.execute('DROP INDEX IF EXISTS file_group_url_idx') + session.execute('DROP INDEX IF EXISTS file_group_viewed_idx') + + session.execute('CREATE INDEX IF NOT EXISTS archive_archive_datetime_idx ON archive(archive_datetime)') + session.execute('CREATE INDEX IF NOT EXISTS archive_url_idx ON archive(url)') + session.execute('CREATE INDEX IF NOT EXISTS video_duration_idx ON video(duration)') + session.execute('CREATE INDEX IF NOT EXISTS video_url_idx ON video(url)') + session.execute('CREATE INDEX IF NOT EXISTS video_viewed_idx ON video(viewed)') diff --git a/alembic/versions/6b0b249a4f81_archive_published_datetime.py b/alembic/versions/6b0b249a4f81_archive_published_datetime.py index b3cddf7b..2c3a0a0c 100644 --- a/alembic/versions/6b0b249a4f81_archive_published_datetime.py +++ b/alembic/versions/6b0b249a4f81_archive_published_datetime.py @@ -25,6 +25,15 @@ def upgrade(): session.execute('ALTER TABLE file_group ADD COLUMN author TEXT') session.execute('ALTER TABLE file_group ADD COLUMN published_datetime TIMESTAMP WITH TIME ZONE') session.execute('ALTER TABLE file_group ADD COLUMN published_modified_datetime TIMESTAMP WITH TIME ZONE') + + # Migrate Video.upload_date to FileGroup.published_datetime. + session.execute(''' + UPDATE file_group + SET published_datetime=upload_date + FROM video + WHERE file_group.id = video.file_group_id + ''') + session.execute('CREATE INDEX IF NOT EXISTS file_group_author_idx ON file_group(author)') session.execute('CREATE INDEX IF NOT EXISTS file_group_published_datetime_idx ON file_group(published_datetime)') session.execute('CREATE INDEX IF NOT EXISTS file_group_published_modified_datetime_idx' @@ -34,9 +43,19 @@ def upgrade(): def downgrade(): bind = op.get_bind() session = Session(bind=bind) + + # Migrate FileGroup.published_datetime to Video.upload_date. + session.execute(''' + UPDATE video + SET upload_date=published_datetime + FROM file_group + WHERE file_group.id = video.file_group_id + ''') + session.execute('DROP INDEX IF EXISTS file_group_author_idx') session.execute('DROP INDEX IF EXISTS file_group_published_datetime_idx') session.execute('DROP INDEX IF EXISTS file_group_published_modified_datetime_idx') + session.execute('ALTER TABLE file_group DROP COLUMN IF EXISTS author') session.execute('ALTER TABLE file_group DROP COLUMN IF EXISTS published_datetime') session.execute('ALTER TABLE file_group DROP COLUMN IF EXISTS published_modified_datetime') diff --git a/app/src/components/Archive.js b/app/src/components/Archive.js index 4aa8a15a..1100fbf7 100644 --- a/app/src/components/Archive.js +++ b/app/src/components/Archive.js @@ -69,10 +69,7 @@ function ArchivePage() { const {archiveFile, history, fetchArchive} = useArchive(archiveId); const {theme} = useContext(ThemeContext); - let title; - if (archiveFile && archiveFile.archive) { - title = archiveFile.archive.title; - } + let title = archiveFile ? archiveFile.title ? archiveFile.title : archiveFile.name : null; useTitle(title); if (archiveFile === null) { @@ -168,7 +165,7 @@ function ArchivePage() { await fetchArchive(); } - const archivedDatetimeString = isoDatetimeToString(data.archive_datetime, true); + const archivedDatetimeString = isoDatetimeToString(archiveFile.download_datetime, true); const publishedDatetimeString = archiveFile.published_datetime ? isoDatetimeToString(archiveFile.published_datetime, true) : 'unknown'; const modifiedDatetimeString = archiveFile.published_modified_datetime @@ -305,7 +302,7 @@ export function ArchiveCard({file}) { }

- {isoDatetimeToString(data.archive_datetime)} + {isoDatetimeToString(file.published_datetime)}

@@ -426,8 +423,11 @@ function ArchivesPage() { } = useSearchArchives(); let archiveOrders = [ - {value: 'date', text: 'Date'}, + {value: 'published_datetime', text: 'Published Date', short: 'P.Date'}, + {value: 'published_modified_datetime', text: 'Modified Date', short: 'M.Date'}, + {value: 'download_datetime', text: 'Download Date', short: 'D.Date'}, {value: 'size', text: 'Size'}, + {value: 'viewed', text: 'Recently Viewed', short: 'R.Viewed'}, ]; if (searchStr) { diff --git a/app/src/components/Common.js b/app/src/components/Common.js index 4189411f..5d69e7e3 100644 --- a/app/src/components/Common.js +++ b/app/src/components/Common.js @@ -148,27 +148,26 @@ export function isoDatetimeToElapsedPopup(dt) { return secondsToElapsedPopup(d.getTime() / 1000); } -export function secondsToDuration(video) { - let duration = video.duration; - let hours = Math.floor(duration / 3600); - duration -= hours * 3600; - let minutes = Math.floor(duration / 60); - let seconds = duration - (minutes * 60); +export function secondsToHMS(totalSeconds) { + let hours = Math.floor(totalSeconds / 3600); + totalSeconds -= hours * 3600; + let minutes = Math.floor(totalSeconds / 60); + let seconds = totalSeconds - (minutes * 60); hours = String('00' + hours).slice(-2); minutes = String('00' + minutes).slice(-2); seconds = String('00' + seconds).slice(-2); - return [hours, minutes, seconds]; + return {hours, minutes, seconds}; } -export function Duration({video}) { - let [hours, minutes, seconds] = secondsToDuration(video); +export function Duration({totalSeconds}) { + const {hours, minutes, seconds} = secondsToHMS(totalSeconds); if (hours > 0) { - return
{hours}:{minutes}:{seconds}
- } else if (video.duration) { - return
{minutes}:{seconds}
+ return
{hours}:{minutes}:{seconds}
+ } else if (totalSeconds) { + return
{minutes}:{seconds}
} else { return <> } @@ -224,7 +223,7 @@ export function RequiredAsterisk() { return * } -export let defaultVideoOrder = '-upload_date'; +export let defaultVideoOrder = '-published_datetime'; export let defaultSearchOrder = 'rank'; export const frequencyOptions = [{key: null, text: '', value: null}, { @@ -1277,7 +1276,7 @@ export function SortButton({sorts = []}) {