動画を確認画面つきで複数削除できるようにする（ステップ13）

2026-10-15 23:27:51 +09:00
parent fd63a401f7
commit cb6fc1df4c
10 changed files with 609 additions and 62 deletions
@@ -4,8 +4,10 @@ import (
 	"errors"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -39,21 +41,15 @@ func TestLibraryAndPlaybackPage(t *testing.T) {
 		t.Fatal("library fields were not escaped")
 	}
 	video := getPage(handler, "/library/1")
-	if video.Code != http.StatusOK || !strings.Contains(video.Body.String(), `<video controls`) || !strings.Contains(video.Body.String(), `src="/videos/1"`) || !strings.Contains(video.Body.String(), `hx-confirm="動画ファイルと記録を削除しますか？"`) || !strings.Contains(video.Body.String(), `/library/series/series1`) || !strings.Contains(video.Body.String(), `前の回はありません`) || !strings.Contains(video.Body.String(), `次の回はありません`) {
+	if video.Code != http.StatusOK || !strings.Contains(video.Body.String(), `<video controls`) || !strings.Contains(video.Body.String(), `src="/videos/1"`) || !strings.Contains(video.Body.String(), `action="/library/delete/confirm"`) || strings.Contains(video.Body.String(), `hx-confirm`) || !strings.Contains(video.Body.String(), `/library/series/series1`) || !strings.Contains(video.Body.String(), `前の回はありません`) || !strings.Contains(video.Body.String(), `次の回はありません`) {
 		t.Fatalf("video page: %d %s", video.Code, video.Body.String())
 	}
 	for _, path := range []string{"/library/bad", "/library/99", "/library/1/delete"} {
 		response := getPage(handler, path)
 		want := http.StatusNotFound
-		if strings.HasSuffix(path, "/delete") {
-			want = http.StatusMethodNotAllowed
-		}
 		if response.Code != want {
 			t.Errorf("%s status=%d want=%d", path, response.Code, want)
 		}
-		if want == http.StatusMethodNotAllowed && !strings.Contains(response.Header().Get("Allow"), "POST") {
-			t.Errorf("%s Allow=%q", path, response.Header().Get("Allow"))
-		}
 	}
 }

@@ -171,7 +167,7 @@ func TestLibraryRejectsInvalidJobIDs(t *testing.T) {
 				t.Errorf("GET %s: %d", path, got)
 			}
 		}
-		if got := postForm(handler, "/library/"+id+"/delete", nil).Code; got != http.StatusNotFound {
+		if got := postForm(handler, "/library/delete", url.Values{"id": {id}}).Code; got != http.StatusBadRequest {
 			t.Errorf("POST delete id=%q: %d", id, got)
 		}
 	}
@@ -262,8 +258,8 @@ func TestVideoPathTraversalAndSymlinkAreRejected(t *testing.T) {
 		if got := getPage(handler, "/videos/1").Code; got != http.StatusNotFound {
 			t.Errorf("path %q status=%d", relative, got)
 		}
-		deleted := postForm(handler, "/library/1/delete", nil)
-		if deleted.Code != http.StatusConflict || len(jobs.jobs) != 1 {
+		deleted := postForm(handler, "/library/delete", url.Values{"id": {"1"}})
+		if deleted.Code != http.StatusOK || len(jobs.jobs) != 1 || !strings.Contains(deleted.Body.String(), "失敗: 1件") {
 			t.Errorf("delete path %q status=%d jobs=%d", relative, deleted.Code, len(jobs.jobs))
 		}
 	}
@@ -291,7 +287,7 @@ func TestVideoSymlinkWithinRootCanBeServedAndDeleted(t *testing.T) {
 	if response := getPage(handler, "/videos/1"); response.Code != http.StatusOK || response.Body.String() != "video" {
 		t.Fatalf("serve: status=%d body=%q", response.Code, response.Body.String())
 	}
-	if response := postForm(handler, "/library/1/delete", nil); response.Code != http.StatusSeeOther || len(jobs.jobs) != 0 {
+	if response := postForm(handler, "/library/delete", url.Values{"id": {"1"}}); response.Code != http.StatusOK || len(jobs.jobs) != 0 {
 		t.Fatalf("delete: status=%d jobs=%d", response.Code, len(jobs.jobs))
 	}
 	if _, err := os.Stat(target); err != nil {
@@ -319,7 +315,7 @@ func TestVideoSymlinkedDirectoryWithinRootCanBeServedAndDeleted(t *testing.T) {
 	if response := getPage(handler, "/videos/1"); response.Code != http.StatusOK || response.Body.String() != "video" {
 		t.Fatalf("serve: status=%d body=%q", response.Code, response.Body.String())
 	}
-	if response := postForm(handler, "/library/1/delete", nil); response.Code != http.StatusSeeOther || len(jobs.jobs) != 0 {
+	if response := postForm(handler, "/library/delete", url.Values{"id": {"1"}}); response.Code != http.StatusOK || len(jobs.jobs) != 0 {
 		t.Fatalf("delete: status=%d jobs=%d", response.Code, len(jobs.jobs))
 	}
 	if _, err := os.Stat(target); !errors.Is(err, os.ErrNotExist) {
@@ -344,7 +340,7 @@ func TestVideoAbsoluteSymlinkWithinRootIsRejectedByOSRoot(t *testing.T) {
 	if got := getPage(handler, "/videos/1").Code; got != http.StatusNotFound {
 		t.Fatalf("absolute symlink serve status=%d", got)
 	}
-	if response := postForm(handler, "/library/1/delete", nil); response.Code != http.StatusConflict || len(jobs.jobs) != 1 {
+	if response := postForm(handler, "/library/delete", url.Values{"id": {"1"}}); response.Code != http.StatusOK || len(jobs.jobs) != 1 || !strings.Contains(response.Body.String(), "失敗: 1件") {
 		t.Fatalf("absolute symlink delete: status=%d jobs=%d", response.Code, len(jobs.jobs))
 	}
 	if _, err := os.Stat(target); err != nil {
@@ -368,8 +364,8 @@ func TestDeleteVideoFileThenRecord(t *testing.T) {
 		fileWasGoneBeforeRecordDelete = errors.Is(err, os.ErrNotExist)
 	}
 	handler := newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, dir, nil)
-	response := postForm(handler, "/library/1/delete", nil)
-	if response.Code != http.StatusSeeOther || response.Header().Get("Location") != "/library" || len(jobs.jobs) != 0 || !fileWasGoneBeforeRecordDelete {
+	response := postForm(handler, "/library/delete", url.Values{"id": {"1"}})
+	if response.Code != http.StatusOK || len(jobs.jobs) != 0 || !fileWasGoneBeforeRecordDelete || !strings.Contains(response.Body.String(), "削除: 1件") {
 		t.Fatalf("delete: status=%d location=%q jobs=%d", response.Code, response.Header().Get("Location"), len(jobs.jobs))
 	}
 	if _, err := os.Stat(path); !os.IsNotExist(err) {
@@ -379,7 +375,7 @@ func TestDeleteVideoFileThenRecord(t *testing.T) {
 		t.Fatalf("empty series folder remains: %v", err)
 	}
 	jobs.jobs["ep1"] = libraryJob(1, "show/missing.mp4")
-	if got := postForm(handler, "/library/1/delete", nil).Code; got != http.StatusSeeOther || len(jobs.jobs) != 0 {
+	if got := postForm(handler, "/library/delete", url.Values{"id": {"1"}}).Code; got != http.StatusOK || len(jobs.jobs) != 0 {
 		t.Fatalf("missing file delete: status=%d jobs=%d", got, len(jobs.jobs))
 	}
 }
@@ -400,8 +396,8 @@ func TestDeleteRedirectsToSeriesWhenEpisodesRemainAndKeepsNonemptyFolder(t *test
 	second.EpisodeID = "ep2"
 	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": first, "ep2": second}}
 	handler := newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, dir, nil)
-	response := postForm(handler, "/library/1/delete", nil)
-	if response.Code != http.StatusSeeOther || response.Header().Get("Location") != "/library/series/series1" || len(jobs.jobs) != 1 {
+	response := postForm(handler, "/library/delete", url.Values{"id": {"1"}})
+	if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), "/library/series/series1") || len(jobs.jobs) != 1 {
 		t.Fatalf("delete: status=%d location=%q jobs=%d", response.Code, response.Header().Get("Location"), len(jobs.jobs))
 	}
 	if _, err := os.Stat(filepath.Join(dir, "show")); err != nil {
@@ -418,8 +414,8 @@ func TestDeleteVideoAtRootNeverRemovesVideoRoot(t *testing.T) {
 		t.Fatal(err)
 	}
 	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": libraryJob(1, "video.mp4")}}
-	response := postForm(newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, dir, nil), "/library/1/delete", nil)
-	if response.Code != http.StatusSeeOther {
+	response := postForm(newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, dir, nil), "/library/delete", url.Values{"id": {"1"}})
+	if response.Code != http.StatusOK {
 		t.Fatalf("delete status=%d", response.Code)
 	}
 	if info, err := os.Stat(dir); err != nil || !info.IsDir() {
@@ -438,8 +434,206 @@ func TestDeleteFailureKeepsRecord(t *testing.T) {
 	}
 	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": libraryJob(1, "blocked")}}
 	handler := newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, dir, nil)
-	response := postForm(handler, "/library/1/delete", nil)
-	if response.Code != http.StatusInternalServerError || len(jobs.jobs) != 1 || !strings.Contains(response.Body.String(), "動画ファイルを削除できませんでした") {
+	response := postForm(handler, "/library/delete", url.Values{"id": {"1"}})
+	if response.Code != http.StatusOK || len(jobs.jobs) != 1 || !strings.Contains(response.Body.String(), "失敗: 1件") {
 		t.Fatalf("failure: status=%d jobs=%d body=%s", response.Code, len(jobs.jobs), response.Body.String())
 	}
 }
+
+func TestDeleteConfirmationSelectionValidationAndDeduplication(t *testing.T) {
+	first := libraryJob(1, "show/one.mp4")
+	second := libraryJob(2, "show/two.mp4")
+	second.EpisodeID = "ep2"
+	second.Title = `<img src=x onerror=alert(1)>`
+	third := libraryJob(3, "other/three.mp4")
+	third.EpisodeID = "ep3"
+	third.SeriesID = "series2"
+	third.SeriesTitle = "別番組"
+	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": first, "ep2": second, "ep3": third}}
+	handler := newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, t.TempDir(), nil)
+
+	for name, values := range map[string]url.Values{
+		"IDのみ":    {"id": {"1"}},
+		"番組のみ":    {"series_id": {"series2"}},
+		"両方と重複除去": {"id": {"1"}, "series_id": {"series1"}},
+	} {
+		t.Run(name, func(t *testing.T) {
+			response := postForm(handler, "/library/delete/confirm", values)
+			if response.Code != http.StatusOK || len(jobs.jobs) != 3 {
+				t.Fatalf("status=%d jobs=%d body=%s", response.Code, len(jobs.jobs), response.Body.String())
+			}
+			if strings.Contains(response.Body.String(), `<img src=x`) || strings.Contains(response.Body.String(), `<script>番組</script>`) {
+				t.Fatal("確認画面でHTMLがエスケープされていない")
+			}
+			if name == "両方と重複除去" && (!strings.Contains(response.Body.String(), `&lt;script&gt;番組&lt;/script&gt;`) || !strings.Contains(response.Body.String(), `&lt;img src=x onerror=alert(1)&gt;`)) {
+				t.Fatalf("番組名または回タイトルのエスケープ結果がない: %s", response.Body.String())
+			}
+			if name == "両方と重複除去" && strings.Count(response.Body.String(), `name="id"`) != 2 {
+				t.Fatalf("重複除去後のhidden ID: %s", response.Body.String())
+			}
+		})
+	}
+	for name, values := range map[string]url.Values{
+		"対象なし":   {},
+		"該当なし":   {"id": {"99"}},
+		"不正ID":   {"id": {"bad"}},
+		"ゼロID":   {"id": {"0"}},
+		"不正番組ID": {"series_id": {"bad-id"}},
+	} {
+		t.Run(name, func(t *testing.T) {
+			if got := postForm(handler, "/library/delete/confirm", values).Code; got != http.StatusBadRequest {
+				t.Fatalf("status=%d", got)
+			}
+		})
+	}
+	tooMany := url.Values{}
+	for i := 1; i <= maxDeleteSelections+1; i++ {
+		tooMany.Add("id", strconv.Itoa(i))
+	}
+	if got := postForm(handler, "/library/delete/confirm", tooMany).Code; got != http.StatusBadRequest {
+		t.Fatalf("上限超過 status=%d", got)
+	}
+	atLimit := url.Values{}
+	for i := 1; i <= maxDeleteSelections; i++ {
+		atLimit.Add("id", strconv.Itoa(i))
+	}
+	if response := postForm(handler, "/library/delete/confirm", atLimit); response.Code != http.StatusOK || len(jobs.jobs) != 3 {
+		t.Fatalf("入力上限ちょうど: status=%d jobs=%d", response.Code, len(jobs.jobs))
+	}
+}
+
+func TestDeleteConfirmationRejectsExpandedSelectionOverLimit(t *testing.T) {
+	makeJobs := func(count int) map[string]store.Job {
+		jobs := make(map[string]store.Job, count)
+		for i := 1; i <= count; i++ {
+			job := libraryJob(int64(i), "show/video.mp4")
+			job.EpisodeID = "ep" + strconv.Itoa(i)
+			jobs[job.EpisodeID] = job
+		}
+		return jobs
+	}
+
+	atLimit := &fakeJobStore{jobs: makeJobs(maxDeleteSelections)}
+	response := postForm(newTestHandlerWithVideoDir(&fakeFetcher{}, atLimit, t.TempDir(), nil),
+		"/library/delete/confirm", url.Values{"series_id": {"series1"}})
+	if response.Code != http.StatusOK || len(atLimit.jobs) != maxDeleteSelections {
+		t.Fatalf("上限ちょうど: status=%d jobs=%d", response.Code, len(atLimit.jobs))
+	}
+
+	overLimit := &fakeJobStore{jobs: makeJobs(maxDeleteSelections + 1)}
+	response = postForm(newTestHandlerWithVideoDir(&fakeFetcher{}, overLimit, t.TempDir(), nil),
+		"/library/delete/confirm", url.Values{"series_id": {"series1"}})
+	if response.Code != http.StatusBadRequest || len(overLimit.jobs) != maxDeleteSelections+1 ||
+		!strings.Contains(response.Body.String(), strconv.Itoa(maxDeleteSelections+1)+"本") ||
+		!strings.Contains(response.Body.String(), "番組を分けて選んでください") {
+		t.Fatalf("上限超過: status=%d jobs=%d body=%s", response.Code, len(overLimit.jobs), response.Body.String())
+	}
+}
+
+func TestBulkDeleteContinuesAfterFailureAndDoesNotExpandSeries(t *testing.T) {
+	dir := t.TempDir()
+	if err := os.MkdirAll(filepath.Join(dir, "show"), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(dir, "show", "one.mp4"), []byte("one"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Mkdir(filepath.Join(dir, "show", "blocked"), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(dir, "show", "blocked", "child"), []byte("x"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	first := libraryJob(1, "show/one.mp4")
+	blocked := libraryJob(2, "show/blocked")
+	blocked.EpisodeID = "ep2"
+	blocked.Title = "削除失敗回"
+	newAfterConfirmation := libraryJob(3, "show/new.mp4")
+	newAfterConfirmation.EpisodeID = "ep3"
+	newAfterConfirmation.Title = "確認後の新着"
+	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": first, "ep2": blocked, "ep3": newAfterConfirmation}}
+	handler := newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, dir, nil)
+
+	response := postForm(handler, "/library/delete", url.Values{
+		"id":        {"1", "2", "99"},
+		"series_id": {"series1"},
+	})
+	if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), "削除: 1件") || !strings.Contains(response.Body.String(), "失敗: 1件") || !strings.Contains(response.Body.String(), "対象外: 1件") {
+		t.Fatalf("status=%d body=%s", response.Code, response.Body.String())
+	}
+	if _, ok := jobs.jobs["ep1"]; ok {
+		t.Fatal("正常な回の記録が残った")
+	}
+	if _, ok := jobs.jobs["ep2"]; !ok {
+		t.Fatal("失敗した回の記録が消えた")
+	}
+	if _, ok := jobs.jobs["ep3"]; !ok {
+		t.Fatal("確認後に増えた回が消えた")
+	}
+	if strings.Contains(response.Body.String(), filepath.Join(dir, "show", "blocked")) {
+		t.Fatal("内部パスが結果画面に出た")
+	}
+	for _, detail := range []string{"directory not empty", "show/blocked"} {
+		if strings.Contains(response.Body.String(), detail) {
+			t.Fatalf("エラー詳細が結果画面に出た: %q", detail)
+		}
+	}
+}
+
+func TestBulkDeleteWhenVideoRootCannotOpenDeletesOnlyRecordWithoutFile(t *testing.T) {
+	withFile := libraryJob(1, "show/video.mp4")
+	withFile.Title = `<img src=x onerror=alert(1)>`
+	withoutFile := libraryJob(2, "")
+	withoutFile.EpisodeID = "ep2"
+	withoutFile.Title = "記録だけの回"
+	withoutFile.FilePath = nil
+	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": withFile, "ep2": withoutFile}}
+	missingRoot := filepath.Join(t.TempDir(), "missing-video-root")
+
+	response := postForm(newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, missingRoot, nil),
+		"/library/delete", url.Values{"id": {"1", "2"}})
+	if response.Code != http.StatusOK ||
+		!strings.Contains(response.Body.String(), "削除: 1件") ||
+		!strings.Contains(response.Body.String(), "失敗: 1件") {
+		t.Fatalf("status=%d body=%s", response.Code, response.Body.String())
+	}
+	if _, ok := jobs.jobs["ep1"]; !ok {
+		t.Fatal("動画ルートを開けない回の記録が消えた")
+	}
+	if _, ok := jobs.jobs["ep2"]; ok {
+		t.Fatal("file_pathがNULLの回の記録が残った")
+	}
+	for _, secret := range []string{missingRoot, "no such file or directory", `<img src=x`} {
+		if strings.Contains(response.Body.String(), secret) {
+			t.Fatalf("内部情報または未エスケープHTMLが結果画面に出た: %q", secret)
+		}
+	}
+	if !strings.Contains(response.Body.String(), `&lt;img src=x onerror=alert(1)&gt;`) {
+		t.Fatalf("失敗した回のタイトルが安全に表示されていない: %s", response.Body.String())
+	}
+}
+
+func TestBulkDeleteRejectsEmptySelection(t *testing.T) {
+	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": libraryJob(1, "show/video.mp4")}}
+	response := postForm(newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, t.TempDir(), nil), "/library/delete", nil)
+	if response.Code != http.StatusBadRequest || len(jobs.jobs) != 1 {
+		t.Fatalf("status=%d jobs=%d", response.Code, len(jobs.jobs))
+	}
+}
+
+func TestLibraryDeleteEntryFormsAndOldRoute(t *testing.T) {
+	jobs := &fakeJobStore{jobs: map[string]store.Job{"ep1": libraryJob(1, "show/video.mp4")}}
+	handler := newTestHandlerWithVideoDir(&fakeFetcher{}, jobs, t.TempDir(), nil)
+	for _, path := range []string{"/library", "/library/series/series1", "/library/1"} {
+		response := getPage(handler, path)
+		if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), `action="/library/delete/confirm"`) {
+			t.Fatalf("%s: status=%d body=%s", path, response.Code, response.Body.String())
+		}
+	}
+	if body := getPage(handler, "/library/1").Body.String(); strings.Contains(body, "hx-confirm") {
+		t.Fatal("再生ページにhx-confirmが残っている")
+	}
+	if got := postForm(handler, "/library/1/delete", nil).Code; got != http.StatusNotFound && got != http.StatusMethodNotAllowed {
+		t.Fatalf("旧経路 status=%d", got)
+	}
+}