mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 19:01:39 -04:00
Multiple videos can be deleted using Videos list view.
This commit is contained in:
parent
69e899e032
commit
00acd9d891
7 changed files with 79 additions and 23 deletions
|
|
@ -156,13 +156,14 @@ export async function getVideo(video_id) {
|
|||
return [data['file'], data['prev'], data['next']];
|
||||
}
|
||||
|
||||
export async function deleteVideo(video_id) {
|
||||
let response = await apiDelete(`${VIDEOS_API}/video/${video_id}`);
|
||||
export async function deleteVideos(videoIds) {
|
||||
const i = videoIds.join(',');
|
||||
let response = await apiDelete(`${VIDEOS_API}/video/${i}`);
|
||||
if (response.status !== 204) {
|
||||
toast({
|
||||
type: 'error',
|
||||
title: 'Unexpected server response',
|
||||
description: 'Failed to delete video. See server logs.',
|
||||
description: 'Failed to delete videos. See server logs.',
|
||||
time: 5000,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -333,8 +333,8 @@ function Archives() {
|
|||
}
|
||||
|
||||
const onDelete = async (e) => {
|
||||
setDeleteOpen(false);
|
||||
e.preventDefault();
|
||||
setDeleteOpen(false);
|
||||
await deleteArchives(selectedArchives);
|
||||
await fetchArchives();
|
||||
setSelectedArchives([]);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import React, {useContext, useState} from 'react';
|
||||
import {deleteVideo, favoriteVideo} from "../api";
|
||||
import {deleteVideos, favoriteVideo} from "../api";
|
||||
import {Link, useNavigate, useParams} from "react-router-dom";
|
||||
import {humanFileSize, humanNumber, PageContainer, secondsToTimestamp, uploadDate, useTitle, VideoCard} from "./Common";
|
||||
import {Confirm} from "semantic-ui-react";
|
||||
|
|
@ -40,7 +40,7 @@ function VideoPage({videoFile, prevFile, nextFile, ...props}) {
|
|||
|
||||
const handleDeleteVideo = async (video_id) => {
|
||||
try {
|
||||
await deleteVideo(video_id)
|
||||
await deleteVideos(video_id)
|
||||
} catch (e) {
|
||||
setDeleteOpen(false);
|
||||
throw e;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import React from 'react';
|
||||
import React, {useState} from 'react';
|
||||
import {Link, Route, Routes, useParams} from "react-router-dom";
|
||||
import {
|
||||
defaultSearchOrder,
|
||||
|
|
@ -11,13 +11,14 @@ import {
|
|||
videoOrders
|
||||
} from "./Common"
|
||||
import VideoPage from "./VideoPlayer";
|
||||
import {Dropdown, PlaceholderHeader, PlaceholderLine, StatisticLabel, StatisticValue} from "semantic-ui-react";
|
||||
import {Confirm, Dropdown, PlaceholderHeader, PlaceholderLine, StatisticLabel, StatisticValue} from "semantic-ui-react";
|
||||
import {Channels, EditChannel, NewChannel} from "./Channels";
|
||||
import {useChannel, useQuery, useSearchVideos, useVideo, useVideoStatistics} from "../hooks/customHooks";
|
||||
import {FilesView} from "./Files";
|
||||
import Grid from "semantic-ui-react/dist/commonjs/collections/Grid";
|
||||
import Icon from "semantic-ui-react/dist/commonjs/elements/Icon";
|
||||
import {Header, Loader, Placeholder, Segment, Statistic, StatisticGroup} from "./Theme";
|
||||
import {Button, Header, Loader, Placeholder, Segment, Statistic, StatisticGroup} from "./Theme";
|
||||
import {deleteVideos} from "../api";
|
||||
|
||||
export function VideoWrapper() {
|
||||
const {videoId} = useParams();
|
||||
|
|
@ -30,6 +31,8 @@ export function VideoWrapper() {
|
|||
function Videos({filter}) {
|
||||
const {channelId} = useParams();
|
||||
const {searchParams, updateQuery} = useQuery();
|
||||
const [selectedVideos, setSelectedVideos] = useState([]);
|
||||
const [deleteOpen, setDeleteOpen] = useState(false);
|
||||
|
||||
let searchOrder = defaultVideoOrder;
|
||||
if (searchParams.get('order')) {
|
||||
|
|
@ -43,7 +46,7 @@ function Videos({filter}) {
|
|||
let filtersEnabled = searchParams.getAll('filter');
|
||||
filtersEnabled = filter ? [...filtersEnabled, filter] : filtersEnabled;
|
||||
|
||||
const {searchStr, setSearchStr, videos, activePage, setPage, limit, setLimit, totalPages, setOrderBy} =
|
||||
const {searchStr, setSearchStr, videos, activePage, setPage, limit, setLimit, totalPages, setOrderBy, fetchVideos} =
|
||||
useSearchVideos(null, channelId, searchOrder, filtersEnabled);
|
||||
const setView = (value) => updateQuery({view: value});
|
||||
const view = searchParams.get('view');
|
||||
|
|
@ -90,6 +93,45 @@ function Videos({filter}) {
|
|||
</Placeholder>;
|
||||
}
|
||||
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
||||
const onDelete = async (e) => {
|
||||
e.preventDefault();
|
||||
setDeleteOpen(false);
|
||||
await deleteVideos(selectedVideos);
|
||||
await fetchVideos();
|
||||
setSelectedVideos([]);
|
||||
}
|
||||
|
||||
const selectElm = <div style={{marginTop: '0.5em'}}>
|
||||
<Button
|
||||
color='red'
|
||||
disabled={!selectedVideos || selectedVideos.length === 0}
|
||||
onClick={() => setDeleteOpen(true)}
|
||||
>Delete</Button>
|
||||
<Confirm
|
||||
open={deleteOpen}
|
||||
content='Are you sure you want to delete these video files? This cannot be undone.'
|
||||
confirmButton='Delete'
|
||||
onCancel={() => setDeleteOpen(false)}
|
||||
onConfirm={onDelete}
|
||||
/>
|
||||
</div>;
|
||||
|
||||
return <>
|
||||
{header}
|
||||
<FilesView
|
||||
|
|
@ -101,6 +143,8 @@ function Videos({filter}) {
|
|||
showView={true}
|
||||
showLimit={true}
|
||||
showSelect={true}
|
||||
onSelect={onSelect}
|
||||
selectElem={selectElm}
|
||||
setView={setView}
|
||||
setLimit={setLimit}
|
||||
setPage={setPage}
|
||||
|
|
|
|||
|
|
@ -236,6 +236,7 @@ export const useSearchVideos = (defaultLimit, channelId, order_by, filters) => {
|
|||
setLimit,
|
||||
setSearchStr,
|
||||
setOrderBy,
|
||||
fetchVideos: localSearchVideos,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from sanic_ext.extensions.openapi import openapi
|
|||
from wrolpi.common import logger, wrol_mode_check, run_after, get_media_directory, \
|
||||
get_relative_to_media_directory
|
||||
from wrolpi.db import get_db_session
|
||||
from wrolpi.errors import InvalidOrderBy
|
||||
from wrolpi.errors import InvalidOrderBy, ValidationError
|
||||
from wrolpi.root_api import json_response
|
||||
from wrolpi.schema import JSONErrorResponse
|
||||
from . import lib
|
||||
|
|
@ -68,14 +68,18 @@ def directories(_, body: schema.DirectoriesRequest):
|
|||
return response.json({'directories': dirs})
|
||||
|
||||
|
||||
@video_bp.delete('/video/<video_id:int>')
|
||||
@openapi.description('Delete a video.')
|
||||
@video_bp.delete('/video/<video_ids:[0-9,]+>')
|
||||
@video_bp.delete('/video/<video_ids:int>')
|
||||
@openapi.description('Delete videos.')
|
||||
@openapi.response(HTTPStatus.NO_CONTENT)
|
||||
@openapi.response(HTTPStatus.NOT_FOUND, JSONErrorResponse)
|
||||
@wrol_mode_check
|
||||
@run_after(lib.save_channels_config)
|
||||
def video_delete(_: Request, video_id: int):
|
||||
with get_db_session(commit=True) as session:
|
||||
video = lib.get_video(session, video_id)
|
||||
video.delete()
|
||||
def video_delete(_: Request, video_ids: str):
|
||||
try:
|
||||
video_ids = [int(i) for i in str(video_ids).split(',')]
|
||||
except Exception:
|
||||
return ValidationError('Unable to parse video ids')
|
||||
|
||||
lib.delete_videos(*video_ids)
|
||||
return response.raw('', HTTPStatus.NO_CONTENT)
|
||||
|
|
|
|||
|
|
@ -1,17 +1,13 @@
|
|||
import pathlib
|
||||
from datetime import datetime
|
||||
from typing import Tuple, Optional, List
|
||||
|
||||
import psycopg2
|
||||
from sqlalchemy.orm import Session
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
from wrolpi.common import run_after, logger
|
||||
from wrolpi.db import get_db_session, get_db_curs, get_ranked_models
|
||||
from wrolpi.db import get_db_session, optional_session
|
||||
from wrolpi.errors import UnknownVideo
|
||||
from wrolpi.files.lib import assign_file_prefetched_models, handle_search_results
|
||||
from wrolpi.files.models import File
|
||||
from wrolpi.vars import PYTEST
|
||||
from wrolpi.files.lib import handle_search_results
|
||||
from ..lib import save_channels_config
|
||||
from ..models import Video
|
||||
|
||||
|
|
@ -156,3 +152,13 @@ def set_video_favorite(video_id: int, favorite: bool) -> Optional[datetime]:
|
|||
favorite = video.set_favorite(favorite)
|
||||
|
||||
return favorite
|
||||
|
||||
|
||||
@optional_session
|
||||
def delete_videos(*video_ids: int, session: Session = None):
|
||||
videos = list(session.query(Video).filter(Video.id.in_(video_ids)))
|
||||
if not videos:
|
||||
raise UnknownVideo('Could not find videos to delete')
|
||||
|
||||
for video in videos:
|
||||
video.delete()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue