Skip to content

Commit ea399ab

Browse files
chengpan168chengpan168
authored
Merge pull request #52 from cmushroom/dev
2.3.0
2 parents c67fec6 + 4729cb3 commit ea399ab

File tree

62 files changed

+1543
-1573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1543
-1573
lines changed

‎.version

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"latestVersionNum": 16,
3-
"latestVersion": "2.2.0",
2+
"latestVersionNum": 17,
3+
"latestVersion": "2.3.0",
44
"updateType": "hint",
5-
"releaseNotes": "1. 查询key 分页列表时, 总数量使用异步查询，列表快速返回 #36 \n2. 增加lua脚本执行功能。"
5+
"releaseNotes": "1. 使用reids 连接池。 \n2. table通用组件支持拷贝行数据, 右键菜单添加快捷键。 #49 \n3. 文本框禁用情况下支持选中复制 #49。 \n4. 表格拖动排序问题修复。 \n5. 点击一个失败的链接,正常redis服务器也无法登录bug修复 #48。 \n6. redis client 重构。"
66
}

‎redis-pro.xcodeproj/project.pbxproj

+62-38
Large diffs are not rendered by default.

‎redis-pro.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+25-7
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,19 @@
3939
{
4040
"identity" : "redistack",
4141
"kind" : "remoteSourceControl",
42-
"location" : "https://github.com/Mordil/RediStack.git",
42+
"location" : "https://github.com/Mordil/RediStack",
4343
"state" : {
44-
"revision" : "16037bbb8248eccaf50b8499d3bb9ed945cfd44c",
45-
"version" : "1.2.1"
44+
"branch" : "master",
45+
"revision" : "555062c62e1568ed3125a51103ac42a9e4f7a626"
46+
}
47+
},
48+
{
49+
"identity" : "swift-atomics",
50+
"kind" : "remoteSourceControl",
51+
"location" : "https://github.com/apple/swift-atomics",
52+
"state" : {
53+
"revision" : "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
54+
"version" : "1.0.2"
4655
}
4756
},
4857
{
@@ -122,17 +131,26 @@
122131
"kind" : "remoteSourceControl",
123132
"location" : "https://github.com/apple/swift-nio.git",
124133
"state" : {
125-
"revision" : "154f1d32366449dcccf6375a173adf4ed2a74429",
126-
"version" : "2.38.0"
134+
"revision" : "b4e0a274f7f34210e97e2f2c50ab02a10b549250",
135+
"version" : "2.41.1"
127136
}
128137
},
129138
{
130139
"identity" : "swift-nio-ssh",
131140
"kind" : "remoteSourceControl",
132141
"location" : "https://github.com/apple/swift-nio-ssh",
133142
"state" : {
134-
"revision" : "09778e0388bda898c7592887f2ec84bb81ef21eb",
135-
"version" : "0.3.3"
143+
"revision" : "fe02717fa9f7eb8d82957d6784bc3d1793f9c1e6",
144+
"version" : "0.4.1"
145+
}
146+
},
147+
{
148+
"identity" : "swift-service-discovery",
149+
"kind" : "remoteSourceControl",
150+
"location" : "https://github.com/apple/swift-service-discovery",
151+
"state" : {
152+
"revision" : "c83afedb1c95ef0111907cd6e2fd03d7175cc0d0",
153+
"version" : "1.2.0"
136154
}
137155
},
138156
{

‎redis-pro.xcodeproj/project.xcworkspace/xcuserdata/chengpan.xcuserdatad/UserInterfaceState.xcuserstate

171 KB
Binary file not shown.

‎redis-pro.xcodeproj/xcuserdata/chengpan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+66
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,70 @@
33
uuid = "1F6FC20B-7A60-4E4D-9CFD-509EE3AA4D81"
44
type = "1"
55
version = "2.0">
6+
<Breakpoints>
7+
<BreakpointProxy
8+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
9+
<BreakpointContent
10+
uuid = "1F235176-678E-4370-AF05-A5C7A05EA8C5"
11+
shouldBeEnabled = "No"
12+
ignoreCount = "0"
13+
continueAfterRunningActions = "No"
14+
filePath = "../../../Library/Developer/Xcode/DerivedData/redis-pro-dqdhwgmlxxtepdhgbmpmdcldlrxf/SourcePackages/checkouts/RediStack/Sources/RediStack/ConnectionPool/ConnectionPool.swift"
15+
startingColumnNumber = "9223372036854775807"
16+
endingColumnNumber = "9223372036854775807"
17+
startingLineNumber = "241"
18+
endingLineNumber = "241"
19+
landmarkName = "connectionCreationFailed(_:retryDelay:logger:)"
20+
landmarkType = "7">
21+
</BreakpointContent>
22+
</BreakpointProxy>
23+
<BreakpointProxy
24+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
25+
<BreakpointContent
26+
uuid = "EA7FEBA8-3D4F-4D85-B16B-E1AAEC4055BE"
27+
shouldBeEnabled = "No"
28+
ignoreCount = "0"
29+
continueAfterRunningActions = "No"
30+
filePath = "../../../Library/Developer/Xcode/DerivedData/redis-pro-dqdhwgmlxxtepdhgbmpmdcldlrxf/SourcePackages/checkouts/RediStack/Sources/RediStack/ConnectionPool/ConnectionPool.swift"
31+
startingColumnNumber = "9223372036854775807"
32+
endingColumnNumber = "9223372036854775807"
33+
startingLineNumber = "198"
34+
endingLineNumber = "198"
35+
landmarkName = "_createConnection(retryDelay:startIn:logger:)"
36+
landmarkType = "7">
37+
</BreakpointContent>
38+
</BreakpointProxy>
39+
<BreakpointProxy
40+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
41+
<BreakpointContent
42+
uuid = "5BE6502F-970F-4408-94FF-3C0CD5C53636"
43+
shouldBeEnabled = "Yes"
44+
ignoreCount = "0"
45+
continueAfterRunningActions = "No"
46+
filePath = "redis-pro/Common/RedisClient/RediStackClient.swift"
47+
startingColumnNumber = "9223372036854775807"
48+
endingColumnNumber = "9223372036854775807"
49+
startingLineNumber = "294"
50+
endingLineNumber = "294"
51+
landmarkName = "close()"
52+
landmarkType = "7">
53+
</BreakpointContent>
54+
</BreakpointProxy>
55+
<BreakpointProxy
56+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
57+
<BreakpointContent
58+
uuid = "A2780896-FB71-452E-B32B-7FA169DB1346"
59+
shouldBeEnabled = "Yes"
60+
ignoreCount = "0"
61+
continueAfterRunningActions = "No"
62+
filePath = "redis-pro/Common/RedisClient/RediStackClient.swift"
63+
startingColumnNumber = "9223372036854775807"
64+
endingColumnNumber = "9223372036854775807"
65+
startingLineNumber = "308"
66+
endingLineNumber = "308"
67+
landmarkName = "RediStackClient"
68+
landmarkType = "3">
69+
</BreakpointContent>
70+
</BreakpointProxy>
71+
</Breakpoints>
672
</Bucket>

‎redis-pro.xcodeproj/xcuserdata/chengpan.xcuserdatad/xcschemes/xcschememanagement.plist

+39-18
Original file line numberDiff line numberDiff line change
@@ -7,84 +7,105 @@
77
<key>CustomDump (Playground) 1.xcscheme</key>
88
<dict>
99
<key>isShown</key>
10-
<false />
10+
<false/>
1111
<key>orderHint</key>
12-
<integer>11</integer>
12+
<integer>6</integer>
1313
</dict>
1414
<key>CustomDump (Playground) 2.xcscheme</key>
1515
<dict>
1616
<key>isShown</key>
17-
<false />
17+
<false/>
18+
<key>orderHint</key>
19+
<integer>7</integer>
20+
</dict>
21+
<key>CustomDump (Playground) 3.xcscheme</key>
22+
<dict>
23+
<key>isShown</key>
24+
<false/>
25+
<key>orderHint</key>
26+
<integer>25</integer>
27+
</dict>
28+
<key>CustomDump (Playground) 4.xcscheme</key>
29+
<dict>
30+
<key>isShown</key>
31+
<false/>
1832
<key>orderHint</key>
19-
<integer>12</integer>
33+
<integer>26</integer>
34+
</dict>
35+
<key>CustomDump (Playground) 5.xcscheme</key>
36+
<dict>
37+
<key>isShown</key>
38+
<false/>
39+
<key>orderHint</key>
40+
<integer>27</integer>
2041
</dict>
2142
<key>CustomDump (Playground).xcscheme</key>
2243
<dict>
2344
<key>isShown</key>
24-
<false />
45+
<false/>
2546
<key>orderHint</key>
26-
<integer>10</integer>
47+
<integer>5</integer>
2748
</dict>
2849
<key>Playground (Playground) 1.xcscheme</key>
2950
<dict>
3051
<key>isShown</key>
31-
<false />
52+
<false/>
3253
<key>orderHint</key>
33-
<integer>4</integer>
54+
<integer>9</integer>
3455
</dict>
3556
<key>Playground (Playground) 2.xcscheme</key>
3657
<dict>
3758
<key>isShown</key>
38-
<false />
59+
<false/>
3960
<key>orderHint</key>
40-
<integer>6</integer>
61+
<integer>10</integer>
4162
</dict>
4263
<key>Playground (Playground) 3.xcscheme</key>
4364
<dict>
4465
<key>isShown</key>
45-
<false />
66+
<false/>
4667
<key>orderHint</key>
4768
<integer>7</integer>
4869
</dict>
4970
<key>Playground (Playground) 4.xcscheme</key>
5071
<dict>
5172
<key>isShown</key>
52-
<false />
73+
<false/>
5374
<key>orderHint</key>
5475
<integer>8</integer>
5576
</dict>
5677
<key>Playground (Playground) 5.xcscheme</key>
5778
<dict>
5879
<key>isShown</key>
59-
<false />
80+
<false/>
6081
<key>orderHint</key>
6182
<integer>9</integer>
6283
</dict>
6384
<key>Playground (Playground).xcscheme</key>
6485
<dict>
6586
<key>isShown</key>
66-
<false />
87+
<false/>
6788
<key>orderHint</key>
68-
<integer>2</integer>
89+
<integer>8</integer>
6990
</dict>
7091
<key>PromiseKit (Playground) 1.xcscheme</key>
7192
<dict>
7293
<key>isShown</key>
73-
<false />
94+
<false/>
7495
<key>orderHint</key>
7596
<integer>3</integer>
7697
</dict>
7798
<key>PromiseKit (Playground) 2.xcscheme</key>
7899
<dict>
79100
<key>isShown</key>
80-
<false />
101+
<false/>
81102
<key>orderHint</key>
82103
<integer>5</integer>
83104
</dict>
84105
<key>PromiseKit (Playground).xcscheme</key>
85106
<dict>
86107
<key>isShown</key>
87-
<false />
108+
<false/>
88109
<key>orderHint</key>
89110
<integer>1</integer>
90111
</dict>

‎redis-pro/Common/ButtonTypeEnum.swift ‎redis-pro/Common/Enums/ButtonTypeEnum.swift

File renamed without changes.

‎redis-pro/Common/MainViewTypeEnum.swift ‎redis-pro/Common/Enums/MainViewTypeEnum.swift

File renamed without changes.

‎redis-pro/Common/RedisConnectionTypeEnum.swift ‎redis-pro/Common/Enums/RedisConnectionTypeEnum.swift

File renamed without changes.

‎redis-pro/Common/RedisKeyTypeEnum.swift ‎redis-pro/Common/Enums/RedisKeyTypeEnum.swift

File renamed without changes.

‎redis-pro/Common/Enums/TableContextMenuEnum.swift

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
//
2+
// TableContextMenuEnum.swift
3+
// redis-pro
4+
//
5+
// Created by chengpan on 2022/8/20.
6+
//
7+
8+
import Foundation
9+
import Cocoa
10+
11+
enum TableContextMenu: String{
12+
case DELETE = "Delete"
13+
case EDIT = "Edit"
14+
15+
// copy
16+
case COPY = "Copy"
17+
case COPY_SCORE = "Copy Score"
18+
case COPY_FIELD = "Copy Field"
19+
case COPY_VALUE = "Copy Value"
20+
21+
// key list
22+
case RENAME = "Rename"
23+
// client list
24+
case KILL = "Kill"
25+
26+
var ext: TableContextMenuExt {
27+
switch self {
28+
case .DELETE:
29+
return .init(keyEquivalent: String(Unicode.Scalar(NSBackspaceCharacter)!))
30+
case .EDIT:
31+
return .init(keyEquivalent: "e")
32+
case .COPY:
33+
return .init(keyEquivalent: "c")
34+
case .COPY_SCORE:
35+
return .init(keyEquivalent: "")
36+
case .COPY_FIELD:
37+
return .init(keyEquivalent: "")
38+
case .COPY_VALUE:
39+
return .init(keyEquivalent: "")
40+
case .RENAME:
41+
return .init(keyEquivalent: "")
42+
case .KILL:
43+
return .init(keyEquivalent: "k")
44+
}
45+
}
46+
}
47+
48+
struct TableContextMenuExt {
49+
var keyEquivalent: String
50+
}

‎redis-pro/Common/Helpers/PasteboardHelper.swift

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// PasteboardHelper.swift
3+
// redis-pro
4+
//
5+
// Created by chengpan on 2022/8/20.
6+
//
7+
8+
import Foundation
9+
import Cocoa
10+
11+
class PasteboardHelper {
12+
13+
static func copy(_ value: String) {
14+
let pasteboard = NSPasteboard.general
15+
pasteboard.clearContents()
16+
pasteboard.setString(value, forType: .string)
17+
}
18+
19+
}

0 commit comments

Comments
 (0)