update docs; resolve #449;

anobaka · Mar 11, 2024 · cbcbd39 · cbcbd39
1 parent 0a71421
commit cbcbd39
Show file tree

Hide file tree

Showing 25 changed files with 86 additions and 17 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,21 @@
+## [1.8.0-beta](https://cdn-public.anobaka.com/app/bakabase/inside-world/1.8.0-beta/installer/Bakabase.InsideWorld.zip) (2024-03-11)
+
+### Features
+
+* 人工批量设置资源属性 ([#449](https://github.com/anobaka/InsideWorld/issues/449))
+* exhentai下载器，当出现连续错误时提前报错，不再尝试任务内部的后续页面 ([#486](https://github.com/anobaka/InsideWorld/issues/486))
+* 优化下载器筛选面板的计数方式 ([#487](https://github.com/anobaka/InsideWorld/issues/487))
+* 一键复制分类 ([#491](https://github.com/anobaka/InsideWorld/issues/491))
+* 将 为媒体库新增加根目录时使用的文件选择器 变更为新版 ([#489](https://github.com/anobaka/InsideWorld/issues/489))
+* 增加媒体库路径时将资源筛选规则默认设置为根目录后的第一层 ([#488](https://github.com/anobaka/InsideWorld/issues/488))
+* 批量创建媒体库，批量配置根目录 ([#490](https://github.com/anobaka/InsideWorld/issues/490))
+* 删除分类时不再要求删除媒体库 ([#492](https://github.com/anobaka/InsideWorld/issues/492))
+
+### Bug Fixes
+
+* 在资源列表页复制资源名称或标签时，如果鼠标移出名称范围会丢失复制目标 ([#494](https://github.com/anobaka/InsideWorld/issues/494))
+* exhentai下载器，当出现连续错误时提前报错，不再尝试任务内部的后续页面 ([#486](https://github.com/anobaka/InsideWorld/issues/486))
+
 ## [1.7.3](https://cdn-public.anobaka.com/app/bakabase/inside-world/1.7.3/installer/Bakabase.InsideWorld.zip) (2024-03-11)
 
 该版本包含[破坏性变更](./BREAKING-CHANGES.md)，在仔细阅读相关说明后再升级至该版本；

diff --git a/docs/README.md b/docs/README.md
@@ -9,13 +9,15 @@ Inside World 是一款离线媒体管理库，用于本地媒体快速处理、
 
 ## 近期版本
 
-*beta版本通常会修复以前的bug，并且具有更新的功能，但可能会引入新的bug；如果您更倾向于稳定性，请下载正式版本*
+*beta版本通常会修复以前的bug，并且具有更新的功能，但可能会引入新的bug*
 
+*如果您更倾向于稳定性，请下载正式版本*
 
 | 版本 | 发布时间 | 下载地址 |
 | ------------- | ------------- | ------------- |
 | [v2.0.0](https://github.com/anobaka/InsideWorld/milestone/51) | 2024 ETA | / |
 | [v1.8.0](https://github.com/anobaka/InsideWorld/milestone/56) | 2024 ETA | / |
+| [v1.8.0-beta](./CHANGELOG.md) | 2024-03-11 | [下载](https://cdn-public.anobaka.com/app/bakabase/inside-world/1.8.0-beta/installer/Bakabase.InsideWorld.zip) |
 | [v1.7.3](./CHANGELOG.md) | 2024-03-11 | [下载](https://cdn-public.anobaka.com/app/bakabase/inside-world/1.7.3/installer/Bakabase.InsideWorld.zip) |
 | [v1.7.2](./CHANGELOG.md) | 2023-10-01 | [下载](https://cdn-public.anobaka.com/app/bakabase/inside-world/1.7.2/installer/Bakabase.InsideWorld.zip) |
 | [v1.7.1](./CHANGELOG.md) | 2023-08-18 | [下载](https://cdn-public.anobaka.com/app/bakabase/inside-world/1.7.1/installer/Bakabase.InsideWorld.zip) |

diff --git a/docs/_sidebar.md b/docs/_sidebar.md
@@ -10,7 +10,7 @@
   - [标签](/guide/tag)
   - [收藏夹](/guide/favorite)
   - [文件处理器](/guide/file-processor)
-  - [批量修改资源](/guide/bulk-modification)
+  - [批量修改资源(v1.8.0+)](/guide/bulk-modification)
   - [下载器](/guide/downloader)
   - [内置播放器](/guide/internal-player)
   - [工具](/guide/tools)

diff --git a/docs/guide/bulk-modification.md b/docs/guide/bulk-modification.md
@@ -1,3 +1,35 @@
 
+您现在可以通过批量修改工具一次性修改多个资源的属性
 
-## 筛选器
+![bulk-modification-example-simple](../img/bulk-modification-example-simple.png)
+![bulk-modification-example-complex-1](../img/bulk-modification-example-complex-1.png)
+![bulk-modification-example-complex-2](../img/bulk-modification-example-complex-2.png)
+
+## 如何使用
+
+### 1. 筛选您需要修改的资源
+
+![bulk-modification-guide-filter-1](../img/bulk-modification-guide-filter-1.png)
+![bulk-modification-guide-filter-2](../img/bulk-modification-guide-filter-2.png)
+![bulk-modification-guide-filter-3](../img/bulk-modification-guide-filter-3.png)
+
+### 2. 设定能辅助您修改资源的临时变量（可选）
+
+![bulk-modification-guide-variable-1](../img/bulk-modification-guide-variable-1.png)
+![bulk-modification-guide-variable-2](../img/bulk-modification-guide-variable-2.png)
+
+### 3. 添加修改步骤
+
+![bulk-modification-guide-process-1](../img/bulk-modification-guide-process-1.png)
+![bulk-modification-guide-process-2](../img/bulk-modification-guide-process-2.png)
+![bulk-modification-guide-process-3](../img/bulk-modification-guide-process-3.png)
+
+### 4. 预览资源变化，确认无误后将其应用
+
+![bulk-modification-guide-result-1](../img/bulk-modification-guide-result-1.png)
+![bulk-modification-guide-result-2](../img/bulk-modification-guide-result-2.png)
+![bulk-modification-guide-result-3](../img/bulk-modification-guide-result-3.png)
+
+## 辅助功能
+
+![bulk-modification-guide-miscellaneous-1](../img/bulk-modification-guide-miscellaneous-1.png)
diff --git a/docs/img/bulk-modification-example-complex-1.png b/docs/img/bulk-modification-example-complex-1.png
diff --git a/docs/img/bulk-modification-example-complex-2.png b/docs/img/bulk-modification-example-complex-2.png
diff --git a/docs/img/bulk-modification-example-simple.png b/docs/img/bulk-modification-example-simple.png
diff --git a/docs/img/bulk-modification-guide-filter-1.png b/docs/img/bulk-modification-guide-filter-1.png
diff --git a/docs/img/bulk-modification-guide-filter-2.png b/docs/img/bulk-modification-guide-filter-2.png
diff --git a/docs/img/bulk-modification-guide-filter-3.png b/docs/img/bulk-modification-guide-filter-3.png
diff --git a/docs/img/bulk-modification-guide-miscellaneous-1.png b/docs/img/bulk-modification-guide-miscellaneous-1.png
diff --git a/docs/img/bulk-modification-guide-process-1.png b/docs/img/bulk-modification-guide-process-1.png
diff --git a/docs/img/bulk-modification-guide-process-2.png b/docs/img/bulk-modification-guide-process-2.png
diff --git a/docs/img/bulk-modification-guide-process-3.png b/docs/img/bulk-modification-guide-process-3.png
diff --git a/docs/img/bulk-modification-guide-result-1.png b/docs/img/bulk-modification-guide-result-1.png
diff --git a/docs/img/bulk-modification-guide-result-2.png b/docs/img/bulk-modification-guide-result-2.png
diff --git a/docs/img/bulk-modification-guide-result-3.png b/docs/img/bulk-modification-guide-result-3.png
diff --git a/docs/img/bulk-modification-guide-variable-1.png b/docs/img/bulk-modification-guide-variable-1.png
diff --git a/docs/img/bulk-modification-guide-variable-2.png b/docs/img/bulk-modification-guide-variable-2.png
diff --git a/...Bakabase.InsideWorld.App.Core/ClientApp/src/components/MediaLibraryPathSelector/index.tsx b/...Bakabase.InsideWorld.App.Core/ClientApp/src/components/MediaLibraryPathSelector/index.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
 import { createPortalOfComponent, standardizePath } from '@/components/utils';
 import BApi from '@/sdk/BApi';
 import store from '@/store';
+import { MediaLibraryAdditionalItem } from '@/sdk/constants';
 
 interface Props {
   onSelect: (path: string) => (Promise<any> | any);
@@ -33,14 +34,14 @@ const MediaLibraryPathSelector = React.forwardRef((props: Props, ref) => {
   }));
 
   useEffect(() => {
-    BApi.mediaLibrary.getAllMediaLibraries()
+    BApi.mediaLibrary.getAllMediaLibraries({ additionalItems: MediaLibraryAdditionalItem.Category })
       .then((a) => {
         const temp = {};
         const categoryNames = {};
         for (const ml of (a.data || [])) {
           if (!(ml.categoryId in temp)) {
             temp[ml.categoryId] = [];
-            categoryNames[ml.categoryId] = ml.categoryName;
+            categoryNames[ml.categoryId] = ml.category?.name;
           }
           if (ml.pathConfigurations != undefined && ml.pathConfigurations?.length > 0) {
             temp[ml.categoryId].push(ml);

diff --git a/src/Bakabase.InsideWorld.App.Core/ClientApp/src/components/MediaLibrarySelectPanel/index.tsx b/src/Bakabase.InsideWorld.App.Core/ClientApp/src/components/MediaLibrarySelectPanel/index.tsx
@@ -3,6 +3,7 @@ import { Tag } from '@alifd/next';
 import React from 'react';
 import BApi from '@/sdk/BApi';
 import './index.scss';
+import { MediaLibraryAdditionalItem } from '@/sdk/constants';
 
 interface IProps {
   multiple?: boolean;
@@ -27,14 +28,14 @@ export default ({
   const [value, setValue] = useState<number[]>(propsValue || defaultValue || []);
 
   useEffect(() => {
-      BApi.mediaLibrary.getAllMediaLibraries().then(r => {
+      BApi.mediaLibrary.getAllMediaLibraries({ additionalItems: MediaLibraryAdditionalItem.Category }).then(r => {
         const cl = (r.data || []).reduce<{
           [cid: number]: {
             name: string;
             id: number;
           }[];
         }>((s, t) => {
-          const arr = (s[t.categoryName!] ??= []);
+          const arr = (s[t.category!.name!] ??= []);
           arr.push({
             name: t.name,
             id: t.id!,

diff --git a/...es/BulkModification/components/BulkModification/FilterDialog/components/ValueRenderer.tsx b/...es/BulkModification/components/BulkModification/FilterDialog/components/ValueRenderer.tsx
@@ -1,7 +1,12 @@
 import { useEffect, useState } from 'react';
 import { Tag } from '@alifd/next';
 import { useTranslation } from 'react-i18next';
-import { BulkModificationProperty, ResourceLanguage, TagAdditionalItem } from '@/sdk/constants';
+import {
+  BulkModificationProperty,
+  MediaLibraryAdditionalItem,
+  ResourceLanguage,
+  TagAdditionalItem,
+} from '@/sdk/constants';
 import BApi from '@/sdk/BApi';
 import { Tag as TagDto } from '@/core/models/Tag';
 
@@ -54,9 +59,9 @@ export default ({
         break;
       }
       case BulkModificationProperty.MediaLibrary: {
-        BApi.mediaLibrary.getAllMediaLibraries().then(r => {
+        BApi.mediaLibrary.getAllMediaLibraries({ additionalItems: MediaLibraryAdditionalItem.Category }).then(r => {
           const newDataSource = r.data?.filter(c => newDs.some(d => d.value == c.id!.toString())).map(item => ({
-            label: `${item.categoryName}:${item.name}`,
+            label: `${item.category?.name}:${item.name}`,
             value: item.id!,
           }));
           setDataSource(newDataSource || []);

diff --git a/...es/BulkModification/components/BulkModification/FilterGroup/components/TargetRenderer.tsx b/...es/BulkModification/components/BulkModification/FilterGroup/components/TargetRenderer.tsx
@@ -2,7 +2,12 @@ import { useEffect, useState } from 'react';
 import { Tag } from '@alifd/next';
 import { useTranslation } from 'react-i18next';
 import { set } from 'immer/dist/utils/common';
-import { BulkModificationProperty, ResourceLanguage, TagAdditionalItem } from '@/sdk/constants';
+import {
+  BulkModificationProperty,
+  MediaLibraryAdditionalItem,
+  ResourceLanguage,
+  TagAdditionalItem,
+} from '@/sdk/constants';
 import BApi from '@/sdk/BApi';
 import { Tag as TagDto } from '@/core/models/Tag';
 
@@ -32,8 +37,8 @@ export default ({
         break;
       }
       case BulkModificationProperty.MediaLibrary: {
-        BApi.mediaLibrary.getAllMediaLibraries().then(r => {
-          const newLabels = r.data?.filter(c => values.some(d => d == c.id!.toString())).map(item => `${item.categoryName}:${item.name}`);
+        BApi.mediaLibrary.getAllMediaLibraries({ additionalItems: MediaLibraryAdditionalItem.Category }).then(r => {
+          const newLabels = r.data?.filter(c => values.some(d => d == c.id!.toString())).map(item => `${item.category?.name}:${item.name}`);
           setLabels(newLabels || []);
         });
         break;

diff --git a/src/Bakabase.InsideWorld.App.Core/ClientApp/src/pages/BulkModification/index.tsx b/src/Bakabase.InsideWorld.App.Core/ClientApp/src/pages/BulkModification/index.tsx
@@ -3,7 +3,12 @@ import SimpleLabel from '@/components/SimpleLabel';
 import './index.scss';
 import CustomIcon from '@/components/CustomIcon';
 import { useTranslation } from 'react-i18next';
-import { BulkModificationProperty, BulkModificationStatus, TagAdditionalItem } from '@/sdk/constants';
+import {
+  BulkModificationProperty,
+  BulkModificationStatus,
+  MediaLibraryAdditionalItem,
+  TagAdditionalItem,
+} from '@/sdk/constants';
 import { useEffect, useState } from 'react';
 import BApi from '@/sdk/BApi';
 import { useTour } from '@reactour/tour';
@@ -56,7 +61,7 @@ export default () => {
       // @ts-ignore
       const tags = (await BApi.tag.getAllTags({ additionalItems: TagAdditionalItem.GroupName | TagAdditionalItem.PreferredAlias })).data ?? [];
       const originals = (await BApi.resource.getAllOriginals()).data ?? [];
-      const mediaLibraries = (await BApi.mediaLibrary.getAllMediaLibraries()).data ?? [];
+      const mediaLibraries = (await BApi.mediaLibrary.getAllMediaLibraries({ additionalItems: MediaLibraryAdditionalItem.Category })).data ?? [];
       setDisplayDataSources({
         [BulkModificationProperty.Publisher]: publishers.reduce<Record<any, any>>((s, t) => {
           s[t.id!] = t.name!;
@@ -72,7 +77,7 @@ export default () => {
           return s;
         }, {}),
         [BulkModificationProperty.MediaLibrary]: mediaLibraries.reduce<Record<any, any>>((s, t) => {
-          s[t.id!] = `[${t.categoryName}] ${t.name!}`;
+          s[t.id!] = `[${t.category?.name}] ${t.name!}`;
           return s;
         }, {}),
       });

diff --git a/src/Bakabase.InsideWorld.App.Wpf/Bakabase.InsideWorld.App.Wpf.csproj b/src/Bakabase.InsideWorld.App.Wpf/Bakabase.InsideWorld.App.Wpf.csproj
@@ -6,7 +6,7 @@
 	  <Nullable>enable</Nullable>
 	  <UseWPF>true</UseWPF>
 	  <ImplicitUsings>enable</ImplicitUsings>
-	  <Version>1.7.3</Version>
+	  <Version>1.8.0-beta</Version>
 	  <SpaRoot>ClientApp\</SpaRoot>
 	  <ApplicationIcon>Assets/favicon.ico</ApplicationIcon>
 	  <InsideWorldCoreAssembly>Bakabase.InsideWorld.App.Core</InsideWorldCoreAssembly>