mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-04 12:36:37 +08:00
fix(organize): 入库二级分类对齐MoviePilot结构 + 手动整理不再作为一级目录
- anime 顶层目录独立为「动漫」(动漫/{国漫,日番,儿童}),不再混入电视剧
- categoryPhysicalRootDir 把二级分类名映射到正确顶层:
动画电影/华语电影/外语电影→电影; 国漫/日番/儿童→动漫;
国产剧/日韩剧/欧美剧/纪录片/综艺/未分类→电视剧; 成人→成人
- 新增 staging 重定向:目标根落在「手动整理」等暂存目录时,上提到
父级媒体根,媒体真正归入分类目录(如 媒体/电影/华语电影/片名),
而非停留在手动整理下或与分类目录并列
- organizeLibraryRootForLayout 跳过 staging 名的库,避免回流暂存目录
- 同步更新陈旧测试期望(电视剧→动漫)+新增 staging 重定向测试
This commit is contained in:
@@ -205,6 +205,36 @@ func TestOrganizeDirectoryHonorsManualMediaType(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeDirectoryRedirectsManualStagingDest(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
src := filepath.Join(root, "downloads")
|
||||
// 目标指向"手动整理"暂存目录:媒体应归入父级媒体根的分类目录,
|
||||
// 而不是停留在 手动整理/ 下,也不是作为分类目录的兄弟目录。
|
||||
dest := filepath.Join(root, "media", "手动整理")
|
||||
writeOrgFile(t, filepath.Join(src, "Some Movie 2024 1080p.mkv"), "movie")
|
||||
|
||||
org := NewOrganizerService(&config.Config{}, zap.NewNop(), newOrganizerTestRepo(t))
|
||||
res, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
|
||||
SourcePath: filepath.Join(src, "Some Movie 2024 1080p.mkv"),
|
||||
DestPath: dest,
|
||||
MediaType: "movie",
|
||||
TransferMode: TransferCopy,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("organize into staging dest: %v", err)
|
||||
}
|
||||
if res.Organized != 1 {
|
||||
t.Fatalf("result = %+v, want organized=1", res)
|
||||
}
|
||||
want := filepath.Join(root, "media", "电影", "Some Movie (2024)", "Some Movie (2024).mkv")
|
||||
if _, err := os.Stat(want); err != nil {
|
||||
t.Fatalf("expected organized movie at %q: %v; items=%+v", want, err, res.Items)
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(dest, "电影")); err == nil {
|
||||
t.Fatalf("media must not be nested under the 手动整理 staging dir")
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeDirectoryHonorsAdultMediaTypeRoot(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
src := filepath.Join(root, "downloads", "ABP-123.mkv")
|
||||
@@ -730,7 +760,7 @@ func TestOrganizeDirectorySmartClassifiesWithLocalNFO(t *testing.T) {
|
||||
if res.Organized != 1 {
|
||||
t.Fatalf("organized = %d, want 1", res.Organized)
|
||||
}
|
||||
want := filepath.Join(dest, "电视剧", "日番", "Some Show", "Season 01", "Some Show - S01E01.mkv")
|
||||
want := filepath.Join(dest, "动漫", "日番", "Some Show", "Season 01", "Some Show - S01E01.mkv")
|
||||
if _, err := os.Stat(want); err != nil {
|
||||
t.Fatalf("expected NFO classified episode at %q: %v", want, err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user