mirrors2/ClashX-Dashboard
1
0
Fork 0
mirror of https://github.com/yJason/ClashX-Dashboard.git synced 2026-02-04 10:02:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc: proxy uuid

Browse Source
This commit is contained in:
mrFq1
2023-05-25 23:52:41 +08:00
parent e9e700362e
commit 33a4eab579
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ClashX Dashboard/ClashX Links/Models/ClashProvider.swift
View File

@@ -30,7 +30,6 @@ class ClashProviderResp: Codable {
} }
class ClashProvider: Codable { class ClashProvider: Codable {
let id = UUID().uuidString
enum ProviderType: String, Codable { enum ProviderType: String, Codable {
case Proxy case Proxy
case String case String

4
ClashX Dashboard/ClashX Links/Models/ClashProxy.swift
View File

@@ -97,7 +97,7 @@ class ClashProxySpeedHistory: Codable {
} }
class ClashProxy: Codable { class ClashProxy: Codable {
let id = UUID().uuidString let id: String?
let name: ClashProxyName let name: ClashProxyName
let type: ClashProxyType let type: ClashProxyType
let all: [ClashProxyName]? let all: [ClashProxyName]?
@@ -145,7 +145,7 @@ class ClashProxy: Codable {
}() }()
private enum CodingKeys: String, CodingKey { private enum CodingKeys: String, CodingKey {
case type, all, history, now, name, udp, xudp, tfo case type, all, history, now, name, udp, xudp, tfo, id
} }
lazy var maxProxyNameLength: CGFloat = { lazy var maxProxyNameLength: CGFloat = {

4
ClashX Dashboard/Models/DBProviderStorage.swift
View File

@@ -16,7 +16,7 @@ class DBProviderStorage: ObservableObject {
} }
class DBProxyProvider: ObservableObject, Identifiable { class DBProxyProvider: ObservableObject, Identifiable {
let id: String let id = UUID().uuidString
@Published var name: ClashProviderName @Published var name: ClashProviderName
@Published var proxies: [DBProxy] @Published var proxies: [DBProxy]
@@ -29,8 +29,6 @@ class DBProxyProvider: ObservableObject, Identifiable {
@Published var updatedAt: String @Published var updatedAt: String
init(provider: ClashProvider) { init(provider: ClashProvider) {
id = provider.id
name = provider.name name = provider.name
proxies = provider.proxies.map(DBProxy.init) proxies = provider.proxies.map(DBProxy.init)
type = provider.type type = provider.type

5
ClashX Dashboard/Models/DBProxyStorage.swift
View File

@@ -22,7 +22,7 @@ class DBProxyStorage: ObservableObject {
} }
class DBProxyGroup: ObservableObject, Identifiable { class DBProxyGroup: ObservableObject, Identifiable {
let id: String let id = UUID().uuidString
@Published var name: ClashProxyName @Published var name: ClashProxyName
@Published var type: ClashProxyType @Published var type: ClashProxyType
@Published var now: ClashProxyName? { @Published var now: ClashProxyName? {
@@ -38,7 +38,6 @@ class DBProxyGroup: ObservableObject, Identifiable {
@Published var currentProxy: DBProxy? @Published var currentProxy: DBProxy?
init(_ group: ClashProxy, resp: ClashProxyResp) { init(_ group: ClashProxy, resp: ClashProxyResp) {
id = group.id
name = group.name name = group.name
type = group.type type = group.type
now = group.now now = group.now
@@ -71,7 +70,7 @@ class DBProxy: ObservableObject {
@Published var delayColor: Color @Published var delayColor: Color
init(_ proxy: ClashProxy) { init(_ proxy: ClashProxy) {
id = proxy.id id = proxy.id ?? UUID().uuidString
name = proxy.name name = proxy.name
type = proxy.type type = proxy.type
tfo = proxy.tfo tfo = proxy.tfo

2
ClashX Dashboard/Views/APISetting/ClashServerAppStorage.swift
View File

@@ -10,7 +10,7 @@ import SwiftUI
typealias SavedServersAppStorage = [ClashServerAppStorage] typealias SavedServersAppStorage = [ClashServerAppStorage]
struct ClashServerAppStorage: Codable, Identifiable { struct ClashServerAppStorage: Codable, Identifiable {
let id = UUID().uuidString var id = UUID().uuidString
let apiURL: String let apiURL: String
let secret: String let secret: String
} }