Merge pull request #30 from xxcheng123/develop

添加订阅分享类型支持

Author: xxcheng123

fe/src/api/storage.ts

@@ -12,7 +12,7 @@ export interface Storage {
   id: number
   parentId: number
   name: string
-  osType: string //  subscribe：订阅类型；share：分享类型；person：个人类型；family：家庭类型
+  osType: string //  subscribe：订阅类型；share：分享类型；person：个人类型；family：家庭类型；subscribe_share：订阅分享类型
   createdAt: string
   updatedAt: string
   localPath: string
@@ -27,9 +27,9 @@ export interface Storage {
 }
 
 export interface PreAddStorageRequest {
-  protocol: string  // 目前只允许 subscribe、share
-  subscribeUser?: string // subscribe 时必填
-  shareCode?: string // share 时必填
+  protocol: string  // 目前允许 subscribe、share、subscribe_share
+  subscribeUser?: string // subscribe、subscribe_share 时必填
+  shareCode?: string // share、subscribe_share 时必填
   shareAccessCode?: string // share 时可选
   cloudToken?: number
 }
@@ -41,10 +41,10 @@ export interface PreAddStorageResponse {
 
 export interface AddStorageRequest {
   localPath: string
-  protocol: string  // 目前允许 subscribe、share、person、family
+  protocol: string  // 目前允许 subscribe、share、person、family、subscribe_share
   cloudToken?: number // person、family 时必填
-  subscribeUser?: string // subscribe 时必填
-  shareCode?: string // share 时必填
+  subscribeUser?: string // subscribe、subscribe_share 时必填
+  shareCode?: string // share、subscribe_share 时必填
   shareAccessCode?: string // share 时可选
   fileId?: string // person、family 时必填
   familyId?: string // family 时必填

fe/src/utils/cloudpan189Parser.ts

@@ -8,7 +8,7 @@ export interface CloudPan189ParseResult {
   shareId: string
   accessCode?: string
   originalUrl: string
-  type: 'share' | 'subscribe' // 链接类型
+  type: 'share' | 'subscribe' | 'subscribe_share' // 链接类型
 }
 
 // 解析错误类
@@ -87,23 +87,41 @@ function parseCloudPanShareLink(input: string): CloudPan189ParseResult {
  * @returns 解析结果
  */
 function parse21cnSubscribeLink(input: string): CloudPan189ParseResult {
-  // 匹配21cn订阅链接中的uuid
-  const uuidRegex = /https?:\/\/content\.21cn\.com\/h5\/subscrip\/index\.html#\/pages\/own-home\/index\?uuid=([a-f0-9]{32})/i
+  // 匹配21cn订阅分享链接（包含uuid和shareCode）
+  const subscribeShareRegex = /https?:\/\/content\.21cn\.com\/h5\/subscrip\/index\.html#\/pages\/own-home\/index\?uuid=([a-f0-9]{32})&shareCode=([a-zA-Z0-9]+)/i
 
-  const match = input.match(uuidRegex)
+  // 匹配普通21cn订阅链接（只有uuid）
+  const subscribeRegex = /https?:\/\/content\.21cn\.com\/h5\/subscrip\/index\.html#\/pages\/own-home\/index\?uuid=([a-f0-9]{32})/i
 
-  if (!match) {
-    throw new CloudPan189ParseError('未找到有效的21cn订阅链接或uuid格式错误', input)
+  // 优先匹配订阅分享类型
+  let match = input.match(subscribeShareRegex)
+  if (match) {
+    const uuid = match[1]
+    const shareCode = match[2]
+    const originalUrl = match[0]
+    
+    return {
+      shareId: uuid,
+      accessCode: shareCode, // 将shareCode存储在accessCode字段中
+      originalUrl,
+      type: 'subscribe_share'
+    }
   }
 
-  const uuid = match[1]
-  const originalUrl = match[0]
-  
-  return {
-    shareId: uuid,
-    originalUrl,
-    type: 'subscribe'
+  // 匹配普通订阅类型
+  match = input.match(subscribeRegex)
+  if (match) {
+    const uuid = match[1]
+    const originalUrl = match[0]
+    
+    return {
+      shareId: uuid,
+      originalUrl,
+      type: 'subscribe'
+    }
   }
+  
+  throw new CloudPan189ParseError('未找到有效的21cn订阅链接或uuid格式错误', input)
 }
 
 /**
@@ -144,11 +162,28 @@ export function parseMultipleCloudPan189Links(input: string): CloudPan189ParseRe
     })
   }
 
-  // 匹配21cn订阅链接
-  const cnUrlRegex = /https?:\/\/content\.21cn\.com\/h5\/subscrip\/index\.html#\/pages\/own-home\/index\?uuid=([a-f0-9]{32})/gi
-  const cnMatches = Array.from(cleanInput.matchAll(cnUrlRegex))
+  // 匹配21cn订阅分享链接（包含uuid和shareCode）
+  const cnSubscribeShareRegex = /https?:\/\/content\.21cn\.com\/h5\/subscrip\/index\.html#\/pages\/own-home\/index\?uuid=([a-f0-9]{32})&shareCode=([a-zA-Z0-9]+)/gi
+  const cnSubscribeShareMatches = Array.from(cleanInput.matchAll(cnSubscribeShareRegex))
+  
+  for (const match of cnSubscribeShareMatches) {
+    const uuid = match[1]
+    const shareCode = match[2]
+    const originalUrl = match[0]
+    
+    results.push({
+      shareId: uuid,
+      accessCode: shareCode,
+      originalUrl,
+      type: 'subscribe_share'
+    })
+  }
+  
+  // 匹配21cn普通订阅链接（只有uuid）
+  const cnSubscribeRegex = /https?:\/\/content\.21cn\.com\/h5\/subscrip\/index\.html#\/pages\/own-home\/index\?uuid=([a-f0-9]{32})(?!&shareCode=)/gi
+  const cnSubscribeMatches = Array.from(cleanInput.matchAll(cnSubscribeRegex))
 
-  for (const match of cnMatches) {
+  for (const match of cnSubscribeMatches) {
     const uuid = match[1]
     const originalUrl = match[0]
 
@@ -168,12 +203,12 @@ export function parseMultipleCloudPan189Links(input: string): CloudPan189ParseRe
  * @param type 链接类型
  * @returns 是否有效
  */
-export function isValidShareId(shareId: string, type: 'share' | 'subscribe' = 'share'): boolean {
+export function isValidShareId(shareId: string, type: 'share' | 'subscribe' | 'subscribe_share' = 'share'): boolean {
   if (!shareId || typeof shareId !== 'string') {
     return false
   }
 
-  if (type === 'subscribe') {
+  if (type === 'subscribe' || type === 'subscribe_share') {
     // uuid格式：32位十六进制字符
     return /^[a-f0-9]{32}$/i.test(shareId)
   }
@@ -199,19 +234,26 @@ export function isValidAccessCode(accessCode: string): boolean {
 /**
  * 构建天翼云盘分享链接或21cn订阅链接
  * @param shareId 分享ID或uuid
- * @param accessCode 访问码（可选）
+ * @param accessCode 访问码或分享码（可选）
  * @param type 链接类型
  * @returns 完整的分享链接
  */
-export function buildCloudPan189Link(shareId: string, accessCode?: string, type: 'share' | 'subscribe' = 'share'): string {
+export function buildCloudPan189Link(shareId: string, accessCode?: string, type: 'share' | 'subscribe' | 'subscribe_share' = 'share'): string {
   if (!isValidShareId(shareId, type)) {
-    throw new CloudPan189ParseError(`无效的${type === 'subscribe' ? 'uuid' : '分享ID'}格式`)
+    throw new CloudPan189ParseError(`无效的${type === 'subscribe' || type === 'subscribe_share' ? 'uuid' : '分享ID'}格式`)
   }
 
   if (type === 'subscribe') {
     return `https://content.21cn.com/h5/subscrip/index.html#/pages/own-home/index?uuid=${shareId}`
   }
 
+  if (type === 'subscribe_share') {
+    if (!accessCode) {
+      throw new CloudPan189ParseError('订阅分享链接需要提供分享码')
+    }
+    return `https://content.21cn.com/h5/subscrip/index.html#/pages/own-home/index?uuid=${shareId}&shareCode=${accessCode}`
+  }
+  
   const baseUrl = `https://cloud.189.cn/t/${shareId}`
 
   if (accessCode) {

fe/src/views/Storage.vue

@@ -82,7 +82,7 @@
               </th>
               <th style="text-align: center">序号</th>
               <th style="text-align: center">挂载路径</th>
-              <th style="width: 100px; text-align: center">协议类型</th>
+              <th style="width: 140px; text-align: center">协议类型</th>
               <th style="width: 260px; text-align: center">任务状态</th>
               <th style="text-align: center">令牌绑定</th>
               <th style="text-align: center">创建时间</th>
@@ -219,6 +219,16 @@
               <input v-model="newStorage.shareAccessCode" type="text" class="form-input" placeholder="请输入访问码（可选）" />
             </div>
           </div>
+          <div v-if="newStorage.protocol === 'subscribe_share'">
+            <div class="form-group">
+              <label class="form-label">订阅用户ID</label>
+              <input v-model="newStorage.subscribeUser" type="text" class="form-input" placeholder="请输入订阅用户ID" />
+            </div>
+            <div class="form-group">
+              <label class="form-label">分享码</label>
+              <input v-model="newStorage.shareCode" type="text" class="form-input" placeholder="请输入分享码" />
+            </div>
+          </div>
           <div v-if="newStorage.protocol === 'person'">
             <div class="form-group">
               <label class="form-label">选择文件夹</label>
@@ -429,7 +439,7 @@
                     </td>
                     <td>
                       <span class="result-type" :class="`type-${result.type}`">
-                        {{ result.type === 'subscribe' ? '订阅' : '分享' }}
+                        {{ result.type === 'subscribe' ? '订阅' : result.type === 'subscribe_share' ? '订阅分享' : '分享' }}
                       </span>
                     </td>
                     <td>
@@ -456,7 +466,7 @@
                     </td>
                     <td>
                       <input 
-                        v-if="result.type === 'subscribe'"
+                        v-if="result.type === 'subscribe' || result.type === 'subscribe_share'"
                         v-model="result.subscribeUser" 
                         type="text" 
                         class="table-input" 
@@ -466,7 +476,7 @@
                     </td>
                     <td>
                       <input 
-                        v-if="result.type === 'share'"
+                        v-if="result.type === 'share' || result.type === 'subscribe_share'"
                         v-model="result.shareCode" 
                         type="text" 
                         class="table-input" 
@@ -601,6 +611,7 @@ const newStorage = reactive({
 const protocolOptions = [
   { label: '订阅类型', value: 'subscribe' },
   { label: '分享类型', value: 'share' },
+  { label: '订阅分享类型', value: 'subscribe_share' },
   { label: '个人类型', value: 'person' },
   { label: '家庭类型', value: 'family' }
 ]
@@ -752,6 +763,15 @@ const confirmAddStorage = async () => {
       toast.warning('请输入分享码')
       return
     }
+  } else if (newStorage.protocol === 'subscribe_share') {
+    if (!newStorage.subscribeUser.trim()) {
+      toast.warning('请输入订阅用户ID')
+      return
+    }
+    if (!newStorage.shareCode.trim()) {
+      toast.warning('请输入分享码')
+      return
+    }
   } else if (newStorage.protocol === 'person') {
     if (!newStorage.cloudToken) {
       toast.warning('个人类型需要选择云盘令牌')
@@ -794,7 +814,10 @@ const confirmAddStorage = async () => {
       if (newStorage.shareAccessCode.trim()) {
         requestData.shareAccessCode = newStorage.shareAccessCode.trim()
       }
-    } else if (newStorage.protocol === 'person') {
+    } else if (newStorage.protocol === 'subscribe_share') {
+       requestData.subscribeUser = newStorage.subscribeUser.trim()
+       requestData.shareCode = newStorage.shareCode.trim()
+     } else if (newStorage.protocol === 'person') {
       requestData.fileId = newStorage.fileId.trim()
     } else if (newStorage.protocol === 'family') {
       requestData.familyId = newStorage.familyId.trim()
@@ -1122,7 +1145,7 @@ const parseLinks = async () => {
     for (const result of results) {
       try {
         const preAddData: any = {
-          protocol: result.type === 'subscribe' ? 'subscribe' : 'share'
+          protocol: result.type === 'subscribe' ? 'subscribe' : result.type === 'subscribe_share' ? 'subscribe_share' : 'share'
         }
         
         if (result.type === 'subscribe') {
@@ -1132,6 +1155,9 @@ const parseLinks = async () => {
           if (result.accessCode) {
             preAddData.shareAccessCode = result.accessCode
           }
+        } else if (result.type === 'subscribe_share') {
+          preAddData.subscribeUser = result.shareId
+          preAddData.shareCode = result.accessCode
         }
         
         if (defaultCloudToken.value) {
@@ -1147,8 +1173,8 @@ const parseLinks = async () => {
           suggestedName,
           localPath: defaultPathPrefix.value ? `${defaultPathPrefix.value}/${suggestedName}` : `/${suggestedName}`,
           cloudToken: defaultCloudToken.value,
-          subscribeUser: result.type === 'subscribe' ? result.shareId : '',
-          shareCode: result.type === 'share' ? result.shareId : ''
+          subscribeUser: result.type === 'subscribe' || result.type === 'subscribe_share' ? result.shareId : '',
+          shareCode: result.type === 'share' ? result.shareId : result.type === 'subscribe_share' ? result.accessCode : ''
         })
       } catch (error) {
         console.warn(`链接验证失败 (${result.originalUrl}):`, error)
@@ -1193,6 +1219,7 @@ const batchImportStorages = async () => {
     if (!result.localPath.trim()) return true
     if (result.type === 'subscribe' && !result.subscribeUser?.trim()) return true
     if (result.type === 'share' && !result.shareCode?.trim()) return true
+    if (result.type === 'subscribe_share' && (!result.subscribeUser?.trim() || !result.shareCode?.trim())) return true
     return false
   })
 
@@ -1211,7 +1238,7 @@ const batchImportStorages = async () => {
       try {
         const requestData: AddStorageRequest = {
           localPath: result.localPath.trim(),
-          protocol: result.type === 'subscribe' ? 'subscribe' : 'share'
+          protocol: result.type === 'subscribe' ? 'subscribe' : result.type === 'subscribe_share' ? 'subscribe_share' : 'share'
         }
 
         if (result.cloudToken) {
@@ -1225,6 +1252,9 @@ const batchImportStorages = async () => {
           if (result.accessCode?.trim()) {
             requestData.shareAccessCode = result.accessCode.trim()
           }
+        } else if (result.type === 'subscribe_share') {
+          requestData.subscribeUser = result.subscribeUser!.trim()
+          requestData.shareCode = result.shareCode!.trim()
         }
 
         await storageApi.add(requestData)
@@ -1309,6 +1339,8 @@ const getProtocolLabel = (protocol: string): string => {
       return '订阅'
     case 'share':
       return '分享'
+    case 'subscribe_share':
+      return '订阅分享'
     case 'cloud_folder':
       return '个人'
     case 'cloud_family_folder':
@@ -1627,6 +1659,11 @@ onUnmounted(() => {
   color: #d97706;
 }
 
+.protocol-subscribe_share {
+  background: #f0fdf4;
+  color: #15803d;
+}
+
 .protocol-cloud_folder {
   background: #f0f9ff;
   color: #0369a1;

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/bradenaw/juniper v0.15.3
 	github.com/bytedance/gopkg v0.1.2
 	github.com/deckarep/golang-set/v2 v2.8.0
-	github.com/gin-gonic/gin v1.10.1
+	github.com/gin-gonic/gin v1.9.1
 	github.com/glebarez/sqlite v1.11.0
 	github.com/go-playground/locales v0.14.1
 	github.com/go-playground/universal-translator v0.18.1

go.sum

@@ -28,8 +28,8 @@ github.com/gammazero/deque v1.1.0 h1:OyiyReBbnEG2PP0Bnv1AASLIYvyKqIFN5xfl1t8oGLo
 github.com/gammazero/deque v1.1.0/go.mod h1:JVrR+Bj1NMQbPnYclvDlvSX0nVGReLrQZ0aUMuWLctg=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
-github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
 github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
 github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=

internal/bus/bus_file.go

@@ -450,6 +450,12 @@ func (w *busWorker) deleteVirtualFileHook(ctx context.Context, fileId int64) err
 		if err := w.delMediaFile(ctx, fileId); err != nil {
 			errs = append(errs, err)
 		}
+
+		// 删除媒体文件后自动清理空文件夹（目前会删除所有的空文件夹）
+		if _, err := w.clearEmptyDirs(ctx); err != nil {
+			w.logger.Warn("清理空文件夹失败", zap.Int64("file_id", fileId), zap.Error(err))
+			// 不将此错误加入到errs中，因为这不应该阻止删除操作
+		}
 	}
 
 	return errors2.Join(errs...)

internal/pkgs/utils/http.go

@@ -0,0 +1,11 @@
+package utils
+
+import (
+	"net/http"
+)
+
+var NoFollowRedirectHttpClient = &http.Client{
+	CheckRedirect: func(req *http.Request, via []*http.Request) error {
+		return http.ErrUseLastResponse // 停止跟随重定向
+	},
+}