Skip to content

Commit

Permalink
Merge pull request #52 from cmushroom/dev
Browse files Browse the repository at this point in the history
2.3.0
  • Loading branch information
chengpan168 committed Aug 28, 2022
2 parents c67fec6 + 4729cb3 commit ea399ab
Show file tree
Hide file tree
Showing 62 changed files with 1,543 additions and 1,573 deletions.
6 changes: 3 additions & 3 deletions .version
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"latestVersionNum": 16,
"latestVersion": "2.2.0",
"latestVersionNum": 17,
"latestVersion": "2.3.0",
"updateType": "hint",
"releaseNotes": "1. 查询key 分页列表时, 总数量使用异步查询,列表快速返回 #36 \n2. 增加lua脚本执行功能。"
"releaseNotes": "1. 使用reids 连接池。 \n2. table通用组件支持拷贝行数据, 右键菜单添加快捷键。 #49 \n3. 文本框禁用情况下支持选中复制 #49。 \n4. 表格拖动排序问题修复。 \n5. 点击一个失败的链接,正常redis服务器也无法登录bug修复 #48。 \n6. redis client 重构。"
}
100 changes: 62 additions & 38 deletions redis-pro.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,19 @@
{
"identity" : "redistack",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Mordil/RediStack.git",
"location" : "https://github.com/Mordil/RediStack",
"state" : {
"revision" : "16037bbb8248eccaf50b8499d3bb9ed945cfd44c",
"version" : "1.2.1"
"branch" : "master",
"revision" : "555062c62e1568ed3125a51103ac42a9e4f7a626"
}
},
{
"identity" : "swift-atomics",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics",
"state" : {
"revision" : "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
"version" : "1.0.2"
}
},
{
Expand Down Expand Up @@ -122,17 +131,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : {
"revision" : "154f1d32366449dcccf6375a173adf4ed2a74429",
"version" : "2.38.0"
"revision" : "b4e0a274f7f34210e97e2f2c50ab02a10b549250",
"version" : "2.41.1"
}
},
{
"identity" : "swift-nio-ssh",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssh",
"state" : {
"revision" : "09778e0388bda898c7592887f2ec84bb81ef21eb",
"version" : "0.3.3"
"revision" : "fe02717fa9f7eb8d82957d6784bc3d1793f9c1e6",
"version" : "0.4.1"
}
},
{
"identity" : "swift-service-discovery",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-service-discovery",
"state" : {
"revision" : "c83afedb1c95ef0111907cd6e2fd03d7175cc0d0",
"version" : "1.2.0"
}
},
{
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,70 @@
uuid = "1F6FC20B-7A60-4E4D-9CFD-509EE3AA4D81"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "1F235176-678E-4370-AF05-A5C7A05EA8C5"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../../Library/Developer/Xcode/DerivedData/redis-pro-dqdhwgmlxxtepdhgbmpmdcldlrxf/SourcePackages/checkouts/RediStack/Sources/RediStack/ConnectionPool/ConnectionPool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "241"
endingLineNumber = "241"
landmarkName = "connectionCreationFailed(_:retryDelay:logger:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "EA7FEBA8-3D4F-4D85-B16B-E1AAEC4055BE"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../../Library/Developer/Xcode/DerivedData/redis-pro-dqdhwgmlxxtepdhgbmpmdcldlrxf/SourcePackages/checkouts/RediStack/Sources/RediStack/ConnectionPool/ConnectionPool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "198"
endingLineNumber = "198"
landmarkName = "_createConnection(retryDelay:startIn:logger:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5BE6502F-970F-4408-94FF-3C0CD5C53636"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "redis-pro/Common/RedisClient/RediStackClient.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "294"
endingLineNumber = "294"
landmarkName = "close()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A2780896-FB71-452E-B32B-7FA169DB1346"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "redis-pro/Common/RedisClient/RediStackClient.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "308"
endingLineNumber = "308"
landmarkName = "RediStackClient"
landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,105 @@
<key>CustomDump (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>11</integer>
<integer>6</integer>
</dict>
<key>CustomDump (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>CustomDump (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>25</integer>
</dict>
<key>CustomDump (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
<integer>26</integer>
</dict>
<key>CustomDump (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>27</integer>
</dict>
<key>CustomDump (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>10</integer>
<integer>5</integer>
</dict>
<key>Playground (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>4</integer>
<integer>9</integer>
</dict>
<key>Playground (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>6</integer>
<integer>10</integer>
</dict>
<key>Playground (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>Playground (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>Playground (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>Playground (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>2</integer>
<integer>8</integer>
</dict>
<key>PromiseKit (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>PromiseKit (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>PromiseKit (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false />
<false/>
<key>orderHint</key>
<integer>1</integer>
</dict>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
50 changes: 50 additions & 0 deletions redis-pro/Common/Enums/TableContextMenuEnum.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
//
// TableContextMenuEnum.swift
// redis-pro
//
// Created by chengpan on 2022/8/20.
//

import Foundation
import Cocoa

enum TableContextMenu: String{
case DELETE = "Delete"
case EDIT = "Edit"

// copy
case COPY = "Copy"
case COPY_SCORE = "Copy Score"
case COPY_FIELD = "Copy Field"
case COPY_VALUE = "Copy Value"

// key list
case RENAME = "Rename"
// client list
case KILL = "Kill"

var ext: TableContextMenuExt {
switch self {
case .DELETE:
return .init(keyEquivalent: String(Unicode.Scalar(NSBackspaceCharacter)!))
case .EDIT:
return .init(keyEquivalent: "e")
case .COPY:
return .init(keyEquivalent: "c")
case .COPY_SCORE:
return .init(keyEquivalent: "")
case .COPY_FIELD:
return .init(keyEquivalent: "")
case .COPY_VALUE:
return .init(keyEquivalent: "")
case .RENAME:
return .init(keyEquivalent: "")
case .KILL:
return .init(keyEquivalent: "k")
}
}
}

struct TableContextMenuExt {
var keyEquivalent: String
}
19 changes: 19 additions & 0 deletions redis-pro/Common/Helpers/PasteboardHelper.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// PasteboardHelper.swift
// redis-pro
//
// Created by chengpan on 2022/8/20.
//

import Foundation
import Cocoa

class PasteboardHelper {

static func copy(_ value: String) {
let pasteboard = NSPasteboard.general
pasteboard.clearContents()
pasteboard.setString(value, forType: .string)
}

}
Loading

0 comments on commit ea399ab

Please sign in to comment.