feat: tags 显示

AnemoFlower · AnemoFlower · commit 0889a10dc3e5 · 2026-06-10T17:09:04.000+08:00
diff --git a/PCL.Mac.Core/Models/Resource.swift b/PCL.Mac.Core/Models/Resource.swift
@@ -28,19 +28,29 @@ public struct Mod: Codable, Hashable, Equatable {
     public let description: String?
     public let icon: ResourceIcon?
     public let loaders: [ModLoader]
+    public let tags: [String]
     public let sources: [Source]
     
-    public init(name: String, version: String, description: String?, icon: ResourceIcon?, loaders: [ModLoader], sources: [Source]) {
+    public init(
+        name: String,
+        version: String,
+        description: String?,
+        icon: ResourceIcon?,
+        loaders: [ModLoader],
+        tags: [String],
+        sources: [Source]
+    ) {
         self.name = name
         self.version = version
         self.description = description
         self.icon = icon
         self.loaders = loaders
+        self.tags = tags
         self.sources = sources
     }
     
     private enum CodingKeys: CodingKey {
         // 不持久化存储 id
-        case name, version, description, icon, loaders, sources
+        case name, version, description, icon, loaders, tags, sources
     }
 }
diff --git a/PCL.Mac.Core/Services/Mod/ModLoadService.swift b/PCL.Mac.Core/Services/Mod/ModLoadService.swift
@@ -13,6 +13,7 @@ public class ModLoadService {
     private let remoteLookupService: ModRemoteLookupService
     private let cache: ModCache
     private let tomlDecoder: TOMLDecoder = .init()
+    private let validPathExtensions = ["jar", "disabled"]
     
     public init(remoteLookupService: ModRemoteLookupService, cache: ModCache) {
         self.remoteLookupService = remoteLookupService
@@ -71,7 +72,7 @@ public class ModLoadService {
         
         func enumerateFiles(body: (URL) throws -> Void) {
             for case let fileURL as URL in enumerator {
-                guard fileURL.pathExtension == "jar" && (try? fileURL.resourceValues(forKeys: [.isRegularFileKey]).isRegularFile) == true else { continue }
+                guard validPathExtensions.contains(fileURL.pathExtension) && (try? fileURL.resourceValues(forKeys: [.isRegularFileKey]).isRegularFile) == true else { continue }
                 do {
                     try body(fileURL)
                 } catch {
@@ -226,6 +227,7 @@ public class ModLoadService {
             description: meta.description ?? remoteInfo?.description,
             icon: icon,
             loaders: loaders,
+            tags: remoteInfo?.tags ?? [],
             sources: (remoteInfo?.source).map { [$0] } ?? []
         )
     }
diff --git a/PCL.Mac.Core/Services/Mod/ModRemoteLookupService.swift b/PCL.Mac.Core/Services/Mod/ModRemoteLookupService.swift
@@ -53,12 +53,14 @@ public class ModRemoteLookupService {
     public struct RemoteModInfo {
         public let name: String
         public let description: String
+        public let tags: [String]
         public let icon: URL?
         public let source: Mod.Source
         
-        public init(name: String, description: String, icon: URL?, source: Mod.Source) {
+        public init(name: String, description: String, tags: [String], icon: URL?, source: Mod.Source) {
             self.name = name
             self.description = description
+            self.tags = tags
             self.icon = icon
             self.source = source
         }
@@ -67,6 +69,7 @@ public class ModRemoteLookupService {
             self.init(
                 name: modrinthProject.title,
                 description: modrinthProject.description,
+                tags: modrinthProject.categories,
                 icon: modrinthProject.iconURL,
                 source: .modrinth(projectId: modrinthProject.id)
             )
@@ -76,6 +79,7 @@ public class ModRemoteLookupService {
             self.init(
                 name: curseforgeMod.name,
                 description: curseforgeMod.summary,
+                tags: [],
                 icon: curseforgeMod.logo.thumbnailURL,
                 source: .curseforge(id: curseforgeMod.id)
             )
diff --git a/PCL.Mac/Components/MyListItem.swift b/PCL.Mac/Components/MyListItem.swift
@@ -67,6 +67,7 @@ struct MyListItem<Content: View>: View {
                 RoundedRectangle(cornerRadius: 4)
                     .fill(hovered ? Color.color2.opacity(0.1) : .clear)
                     .scaleEffect(backgroundScale)
+                    .allowsHitTesting(false)
             }
             .onHover { hovered in
                 withAnimation(.spring(response: 0.2)) {
diff --git a/PCL.Mac/Models/ProjectListItemModel.swift b/PCL.Mac/Models/ProjectListItemModel.swift
@@ -67,6 +67,10 @@ struct ProjectListItemModel: Identifiable, Equatable, Hashable {
         }
     }
     
+    public static func localizeTag(_ key: String) -> String {
+        return tagMap[key] ?? key
+    }
+    
     private static func generateSupportDescription(for project: ModrinthProject) -> (String, Bool) {
         var description: String = ""
         
diff --git a/PCL.Mac/Models/ResourceDisplayModel.swift b/PCL.Mac/Models/ResourceDisplayModel.swift
@@ -14,16 +14,20 @@ struct ModDisplayModel {
     let name: String
     let version: String
     let description: String
+    let tags: [String]
     let icon: ListItem.Image
+    let fileName: String
     
-    init(name: String, version: String, description: String, icon: ListItem.Image?) {
+    init(name: String, version: String, description: String, tags: [String], icon: ListItem.Image?, fileName: String) {
         self.name = name
         self.version = version
         self.description = description
+        self.tags = tags
         self.icon = icon ?? .resource(.iconModLogo)
+        self.fileName = fileName
     }
     
-    init(_ mod: Mod) {
+    init(_ url: URL, _ mod: Mod) {
         let icon: ListItem.Image?
         if let modIcon = mod.icon {
             switch modIcon {
@@ -45,7 +49,9 @@ struct ModDisplayModel {
             name: mod.name,
             version: mod.version,
             description: mod.description ?? "",
-            icon: icon
+            tags: mod.tags.map(ProjectListItemModel.localizeTag(_:)),
+            icon: icon,
+            fileName: url.lastPathComponent
         )
     }
 }
diff --git a/PCL.Mac/ViewModels/Instance/InstalledModsViewModel.swift b/PCL.Mac/ViewModels/Instance/InstalledModsViewModel.swift
@@ -72,7 +72,7 @@ class InstalledModsViewModel: ObservableObject {
                 let resources = try loadResult[start..<end]
                     .map {
                         try Task.checkCancellation()
-                        return ModDisplayModel($0.1)
+                        return ModDisplayModel($0.0, $0.1)
                     }
                 await MainActor.run {
                     self.resources = resources
diff --git a/PCL.Mac/Views/Launch/InstanceSettings/InstalledModsPage.swift b/PCL.Mac/Views/Launch/InstanceSettings/InstalledModsPage.swift
@@ -106,16 +106,22 @@ private struct ResourceListItem: View {
                 .foregroundStyle(Color.color1)
                 
                 VStack(alignment: .leading) {
-                    HStack(spacing: 0) {
+                    HStack(alignment: .center, spacing: 0) {
                         MyText(resource.name)
-                            .lineLimit(1)
-                        MyText(" | \(resource.version)", color: .colorGray3)
+                        MyText(" | \(resource.fileName)", size: 12, color: .colorGray3)
+                        HStack(spacing: 3) {
+                            ForEach(resource.tags, id: \.self) { tag in
+                                MyTag(tag, labelColor: .colorGray2, backgroundColor: .black.opacity(0.05), size: 12)
+                            }
+                        }
+                        .padding(.leading, 3)
                     }
-                    MyText("\(resource.version) | \(resource.description)", color: .colorGray3)
-                        .lineLimit(1)
+                    MyText("\(resource.version) | \(resource.description)", size: 12, color: .colorGray3)
                 }
+                .lineLimit(1)
+                .textSelection(.enabled)
                 
-                Spacer()
+                Spacer(minLength: 0)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ struct MyListItem<Content: View>: View {`
`67`	`67`	`RoundedRectangle(cornerRadius: 4)`
`68`	`68`	`.fill(hovered ? Color.color2.opacity(0.1) : .clear)`
`69`	`69`	`.scaleEffect(backgroundScale)`
	`70`	`+ .allowsHitTesting(false)`
`70`	`71`	`}`
`71`	`72`	`.onHover { hovered in`
`72`	`73`	`withAnimation(.spring(response: 0.2)) {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ struct ProjectListItemModel: Identifiable, Equatable, Hashable {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ public static func localizeTag(_ key: String) -> String {`
	`71`	`+ return tagMap[key] ?? key`
	`72`	`+ }`
	`73`	`+`
`70`	`74`	`private static func generateSupportDescription(for project: ModrinthProject) -> (String, Bool) {`
`71`	`75`	`var description: String = ""`
`72`	`76`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class InstalledModsViewModel: ObservableObject {`
`72`	`72`	`let resources = try loadResult[start..<end]`
`73`	`73`	`.map {`
`74`	`74`	`try Task.checkCancellation()`
`75`		`- return ModDisplayModel($0.1)`
	`75`	`+ return ModDisplayModel($0.0, $0.1)`
`76`	`76`	`}`
`77`	`77`	`await MainActor.run {`
`78`	`78`	`self.resources = resources`
Original file line number	Diff line number	Diff line change
`@@ -106,16 +106,22 @@ private struct ResourceListItem: View {`
`106`	`106`	`.foregroundStyle(Color.color1)`
`107`	`107`
`108`	`108`	`VStack(alignment: .leading) {`
`109`		`- HStack(spacing: 0) {`
	`109`	`+ HStack(alignment: .center, spacing: 0) {`
`110`	`110`	`MyText(resource.name)`
`111`		`- .lineLimit(1)`
`112`		`- MyText(" \| \(resource.version)", color: .colorGray3)`
	`111`	`+ MyText(" \| \(resource.fileName)", size: 12, color: .colorGray3)`
	`112`	`+ HStack(spacing: 3) {`
	`113`	`+ ForEach(resource.tags, id: \.self) { tag in`
	`114`	`+ MyTag(tag, labelColor: .colorGray2, backgroundColor: .black.opacity(0.05), size: 12)`
	`115`	`+ }`
	`116`	`+ }`
	`117`	`+ .padding(.leading, 3)`
`113`	`118`	`}`
`114`		`- MyText("\(resource.version) \| \(resource.description)", color: .colorGray3)`
`115`		`- .lineLimit(1)`
	`119`	`+ MyText("\(resource.version) \| \(resource.description)", size: 12, color: .colorGray3)`
`116`	`120`	`}`
	`121`	`+ .lineLimit(1)`
	`122`	`+ .textSelection(.enabled)`
`117`	`123`
`118`		`- Spacer()`
	`124`	`+ Spacer(minLength: 0)`
`119`	`125`	`}`
`120`	`126`	`}`
`121`	`127`	`}`