From 797bdc431cd0e401c6568d92cc13ae55026bae6a Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 24 Oct 2022 17:15:15 -0600 Subject: [PATCH] Creating invert/clear buttons for SelectableTable. --- app/src/components/Archive.js | 44 ++++++++++++++++++++++++----------- app/src/components/Common.js | 2 +- app/src/components/Files.js | 11 +++++++-- app/src/components/Tables.js | 16 ++++++++----- app/src/components/Videos.js | 44 ++++++++++++++++++++++++----------- app/src/hooks/customHooks.js | 6 ++--- modules/videos/models.py | 6 ++--- 7 files changed, 87 insertions(+), 42 deletions(-) diff --git a/app/src/components/Archive.js b/app/src/components/Archive.js index b26d033c..3ece98f4 100644 --- a/app/src/components/Archive.js +++ b/app/src/components/Archive.js @@ -320,29 +320,32 @@ function Archives() { ); const onSelect = (path, checked) => { - let archiveId; - if (archives) { - archives.forEach(i => { - if (i && i['archive'] && i['path'] === path) { - archiveId = i['archive']['id']; - } - }); - } - if (checked && archiveId) { - setSelectedArchives([...selectedArchives, archiveId]); - } else { - setSelectedArchives(selectedArchives.filter(i => i !== archiveId)); + if (checked && path) { + setSelectedArchives([...selectedArchives, path]); + } else if (path) { + setSelectedArchives(selectedArchives.filter(i => i !== path)); } } const onDelete = async (e) => { e.preventDefault(); setDeleteOpen(false); - await deleteArchives(selectedArchives); + const archiveIds = archives.filter(i => selectedArchives.indexOf(i['path']) >= 0).map(i => i['archive']['id']); + await deleteArchives(archiveIds); await fetchArchives(); setSelectedArchives([]); } + const invertSelection = async () => { + const newSelectedArchives = archives.map(archive => archive['key']).filter(i => selectedArchives.indexOf(i) < 0); + setSelectedArchives(newSelectedArchives); + } + + const clearSelection = async (e) => { + if (e) e.preventDefault(); + setSelectedArchives([]); + } + const selectElm =
+
; return @@ -187,6 +189,8 @@ function FileCard({file}) { {textEllipsis(file.title || file.stem || file.path)} +

{uploadDate(file.modified / 1000)}

+

{size}

} @@ -248,7 +252,7 @@ function FileRow({file}) { } -export function FileTable({files, selectOn, onSelect, footer}) { +export function FileTable({files, selectOn, onSelect, footer, selectedKeys}) { if (files && files.length > 0) { const headerContents = ['Poster', 'Title']; const rows = files.map(i => ); @@ -256,6 +260,7 @@ export function FileTable({files, selectOn, onSelect, footer}) { headerContents={headerContents} selectOn={selectOn} onSelect={onSelect} + selectedKeys={selectedKeys} footer={footer} rows={rows} />; @@ -282,6 +287,7 @@ export function FilesView({ showView = true, showSelect = false, selectElem, + selectedKeys, onSelect, setPage, menuColumnsCount, @@ -343,7 +349,8 @@ export function FilesView({ {selectElem} : null; - body = ; + body = ; } else { body = ; } diff --git a/app/src/components/Tables.js b/app/src/components/Tables.js index b7c3c5a0..66de30cf 100644 --- a/app/src/components/Tables.js +++ b/app/src/components/Tables.js @@ -2,7 +2,7 @@ import {Table} from "./Theme"; import {Checkbox, TableBody, TableCell, TableFooter, TableHeader, TableHeaderCell, TableRow} from "semantic-ui-react"; import React from "react"; -export function SelectableTable({headerContents, selectOn, onSelect, footer, rows}) { +export function SelectableTable({headerContents, selectOn, onSelect, selectedKeys, footer, rows}) { footer = footer ? {selectOn && } @@ -19,28 +19,32 @@ export function SelectableTable({headerContents, selectOn, onSelect, footer, row {rows.map(row => - {row})} + + {row} + )} {footer} } function SelectableRow(props) { - const {selectOn, onSelect} = props; + const {selectOn, onSelect, selectedKeys} = props; + const key = props.children.key; + const c = selectedKeys && selectedKeys.indexOf(key) >= 0; let selectCell; if (selectOn) { const localOnSelect = (e, {checked}) => { try { - onSelect(props.children.key, checked); + onSelect(key, checked); } catch (e) { console.error('No onSelect declared'); } }; selectCell = - + ; } - return + return {selectCell} {props.children} diff --git a/app/src/components/Videos.js b/app/src/components/Videos.js index 1b567d9e..114f6943 100644 --- a/app/src/components/Videos.js +++ b/app/src/components/Videos.js @@ -112,29 +112,32 @@ function Videos({filter}) { } const onSelect = (path, checked) => { - let videoId; - if (videos) { - videos.forEach(i => { - if (i && i['video'] && i['path'] === path) { - videoId = i['video']['id']; - } - }); - } - if (checked && videoId) { - setSelectedVideos([...selectedVideos, videoId]); - } else { - setSelectedVideos(selectedVideos.filter(i => i !== videoId)); + if (checked && path) { + setSelectedVideos([...selectedVideos, path]); + } else if (path) { + setSelectedVideos(selectedVideos.filter(i => i !== path)); } } const onDelete = async (e) => { e.preventDefault(); setDeleteOpen(false); - await deleteVideos(selectedVideos); + const videoIds = videos.filter(i => selectedVideos.indexOf(i['path']) >= 0).map(i => i['video']['id']); + await deleteVideos(videoIds); await fetchVideos(); setSelectedVideos([]); } + const invertSelection = async () => { + const newSelectedVideos = videos.map(video => video['key']).filter(i => selectedVideos.indexOf(i) < 0); + setSelectedVideos(newSelectedVideos); + } + + const clearSelection = async (e) => { + if (e) e.preventDefault(); + setSelectedVideos([]); + } + const selectElm =
+
; return <> @@ -162,6 +179,7 @@ function Videos({filter}) { showLimit={true} showSelect={true} onSelect={onSelect} + selectedKeys={selectedVideos} selectElem={selectElm} setView={setView} setLimit={setLimit} diff --git a/app/src/hooks/customHooks.js b/app/src/hooks/customHooks.js index 7f92941b..664e78dd 100644 --- a/app/src/hooks/customHooks.js +++ b/app/src/hooks/customHooks.js @@ -662,9 +662,9 @@ export const useVideoStatistics = () => { try { let stats = await getStatistics(); stats.videos.sum_duration = secondsToFullDuration(stats.videos.sum_duration); - stats.videos.sum_size = humanFileSize(stats.videos.sum_size, true); - stats.videos.max_size = humanFileSize(stats.videos.max_size, true); - stats.historical.average_size = humanFileSize(stats.historical.average_size, true); + stats.videos.sum_size = humanFileSize(stats.videos.sum_size); + stats.videos.max_size = humanFileSize(stats.videos.max_size); + stats.historical.average_size = humanFileSize(stats.historical.average_size); setStatistics(stats); } catch (e) { console.error(e); diff --git a/modules/videos/models.py b/modules/videos/models.py index 71f56dd2..bd71e114 100644 --- a/modules/videos/models.py +++ b/modules/videos/models.py @@ -8,7 +8,7 @@ from sqlalchemy import Column, Integer, String, Boolean, JSON, Date, ARRAY, Fore from sqlalchemy.orm import relationship, Session from sqlalchemy.orm.collections import InstrumentedList -from wrolpi.common import Base, ModelHelper, logger, get_media_directory +from wrolpi.common import Base, ModelHelper, logger, get_media_directory, background_task from wrolpi.dates import now, TZDateTime from wrolpi.db import get_db_curs from wrolpi.downloader import Download, download_manager @@ -360,9 +360,7 @@ class Channel(ModelHelper, Base): self.skip_download_videos = skip_download_videos def delete_with_videos(self): - """ - Delete all Video records (but not video files) related to this Channel. Then delete the Channel. - """ + """Delete all Video records (but not video files) related to this Channel. Then delete the Channel.""" session = Session.object_session(self) # Delete the video records, but not the video files! session.query(Video).filter_by(channel_id=self.id).delete()