diff options
| -rw-r--r-- | Hotline/Hotline/HotlineClient.swift | 40 | ||||
| -rw-r--r-- | Hotline/Hotline/HotlineProtocol.swift | 8 | ||||
| -rw-r--r-- | Hotline/Models/FileDetails.swift | 13 | ||||
| -rw-r--r-- | Hotline/Models/Hotline.swift | 11 | ||||
| -rw-r--r-- | Hotline/macOS/FileDetailsView.swift | 147 | ||||
| -rw-r--r-- | Hotline/macOS/FilesView.swift | 11 |
6 files changed, 228 insertions, 2 deletions
diff --git a/Hotline/Hotline/HotlineClient.swift b/Hotline/Hotline/HotlineClient.swift index 7006c59..367ed74 100644 --- a/Hotline/Hotline/HotlineClient.swift +++ b/Hotline/Hotline/HotlineClient.swift @@ -608,6 +608,46 @@ class HotlineClient: NetSocketDelegate { } } + @MainActor func sendGetFileInfo(name fileName: String, path filePath: [String], callback: ((FileDetails?) -> Void)? = nil) { + var t = HotlineTransaction(type: .getFileInfo) + t.setFieldString(type: .fileName, val: fileName) + t.setFieldPath(type: .filePath, val: filePath) + + self.sendPacket(t) { reply, err in + guard err == nil, + let fileName = reply.getField(type: .fileName)?.getString(), + let fileCreator = reply.getField(type: .fileCreatorString)?.getString(), + let fileComment = reply.getField(type: .fileComment)?.getString(), + let fileType = reply.getField(type: .fileType)?.getString(), + let fileCreateDate = reply.getField(type: .fileCreateDate)?.data.readDate(at: 0), + let fileModifyDate = reply.getField(type: .fileModifyDate)?.data.readDate(at: 0), + let fileSizeField = reply.getField(type: .fileSize), + let fileSize = fileSizeField.getInteger() else { + callback?(nil) + return + } + + callback?(FileDetails(name: fileName, path: filePath, size: fileSize, comment: fileComment, type: fileType, creator: fileCreator, + created: fileCreateDate, modified: fileModifyDate)) + } + } + + @MainActor func sendSetFileInfo(fileName: String, path filePath: [String], fileNewName: String?, comment: String?, encoding: String.Encoding = .utf8) { + var t = HotlineTransaction(type: .setFileInfo) + t.setFieldString(type: .fileName, val: fileName, encoding: encoding) + t.setFieldPath(type: .filePath, val: filePath) + + if fileNewName != nil { + t.setFieldString(type: .fileNewName, val: fileNewName!, encoding: encoding) + } + + if comment != nil { + t.setFieldString(type: .fileComment, val: comment!, encoding: encoding) + } + + self.sendPacket(t) + } + @MainActor func sendDownloadFile(name fileName: String, path filePath: [String], preview: Bool = false, callback: ((Bool, UInt32?, Int?, Int?, Int?) -> Void)? = nil) { var t = HotlineTransaction(type: .downloadFile) t.setFieldString(type: .fileName, val: fileName) diff --git a/Hotline/Hotline/HotlineProtocol.swift b/Hotline/Hotline/HotlineProtocol.swift index f98e07b..1f9ff3e 100644 --- a/Hotline/Hotline/HotlineProtocol.swift +++ b/Hotline/Hotline/HotlineProtocol.swift @@ -752,8 +752,14 @@ enum HotlineTransactionFieldType: UInt16 { case fileName = 201 // String case filePath = 202 // Path case fileTransferOptions = 204 // Integer + case fileTypeString = 205 // String + case fileCreatorString = 206 // String case fileSize = 207 // Integer - // TODO: Add file field types + case fileCreateDate = 208 + case fileModifyDate = 209 + case fileComment = 210 // Integer + case fileNewName = 211 // String + case fileType = 213 // Integer case quotingMessage = 214 // String? case automaticResponse = 215 // String case folderItemCount = 220 // Integer diff --git a/Hotline/Models/FileDetails.swift b/Hotline/Models/FileDetails.swift new file mode 100644 index 0000000..20b1ee2 --- /dev/null +++ b/Hotline/Models/FileDetails.swift @@ -0,0 +1,13 @@ +import UniformTypeIdentifiers + +struct FileDetails:Identifiable { + let id = UUID() + var name: String + var path: [String] + var size: Int + var comment: String + var type: String + var creator: String + var created: Date + var modified: Date +} diff --git a/Hotline/Models/Hotline.swift b/Hotline/Models/Hotline.swift index 6b5e3a7..7c05778 100644 --- a/Hotline/Models/Hotline.swift +++ b/Hotline/Models/Hotline.swift @@ -440,6 +440,17 @@ final class Hotline: HotlineClientDelegate, HotlineFileClientDelegate { } } } + + @MainActor func fileDetails(_ fileName: String, path: [String], complete callback: ((FileDetails?) -> Void)? = nil) { + var fullPath: [String] = [] + if path.count > 1 { + fullPath = Array(path[0..<path.count-1]) + } + + self.client.sendGetFileInfo(name: fileName, path: fullPath) { info in + callback?(info) + } + } @MainActor func previewFile(_ fileName: String, path: [String], complete callback: ((PreviewFileInfo?) -> Void)? = nil) { var fullPath: [String] = [] diff --git a/Hotline/macOS/FileDetailsView.swift b/Hotline/macOS/FileDetailsView.swift new file mode 100644 index 0000000..d3c10e8 --- /dev/null +++ b/Hotline/macOS/FileDetailsView.swift @@ -0,0 +1,147 @@ +import Foundation +import SwiftUI + +struct FileDetailsView: View { + @Environment(Hotline.self) private var model: Hotline + @Environment(\.presentationMode) var presentationMode + + var fd: FileDetails + + @State private var comment: String = "" + @State private var filename: String = "" + + var body: some View { + VStack (alignment: .leading){ + Form { + HStack(alignment: .center){ + FileIconView(filename: fd.name) + .frame(width: 16, height: 16) + TextField("", text: $filename) + .disabled(!self.canRename()) + } + HStack(alignment: .center){ + Text("Type:").bold().padding(.leading, 43) + Text(fd.type) + } + HStack(alignment: .center){ + Text("Creator:").bold().padding(.leading, 26) + Text(fd.creator) + } + HStack(alignment: .center){ + Text("Size:").bold().bold().padding(.leading, 48) + Text(self.formattedSize(byteCount: fd.size)) + } + HStack(alignment: .center){ + Text("Created:").bold().padding(.leading, 24) + Text("\(FileDetailsView.dateFormatter.string(from: fd.created))") + } + HStack(alignment: .center){ + Text("Modified:").bold().padding(.leading, 19) + Text("\(FileDetailsView.dateFormatter.string(from: fd.modified))") + } + HStack(alignment: .center){ + Text("Comments:").bold().padding(.top, 8) + .padding(.leading, 5) + } + + VStack(alignment: .trailing){ + TextEditor(text: $comment) + .padding(.leading, 2) + .padding(.top, 1) + .font(.system(size: 13)) + .background(Color(nsColor: .textBackgroundColor)) + .border(Color.secondary, width: 1) + .clipShape(RoundedRectangle(cornerRadius: 2, style: .continuous)) + .disabled(!self.canSetComment()) + } + } + .toolbar { + ToolbarItem(placement: .cancellationAction) { + Button("Cancel") { + presentationMode.wrappedValue.dismiss() + } + } + + ToolbarItem(placement: .primaryAction) { + Button{ + var editedFilename: String? + if filename != fd.name { + editedFilename = filename + } + + var editedComment: String? + if comment != fd.comment { + editedComment = comment + } + + model.client.sendSetFileInfo(fileName: fd.name, path: fd.path, fileNewName: editedFilename, comment: editedComment) + presentationMode.wrappedValue.dismiss() + + // TODO: Update the file list if the filename was changed + } label: { + Text("Save") + }.disabled(!isEdited()) + } + } + + .onAppear { + self.filename = fd.name + self.comment = fd.comment + } + .padding(EdgeInsets(top: 16, leading: 24, bottom: 16, trailing: 24)) + } + .frame(minWidth: 400, minHeight: 400) + } + + + static var dateFormatter: DateFormatter = { + var dateFormatter = DateFormatter() + dateFormatter.dateStyle = .long + dateFormatter.timeStyle = .short + + // Original format: Fri, Aug 20, 2021, 5:14:07 PM + return dateFormatter + }() + + static var byteCountSizeFormatter: NumberFormatter = { + let numberFormatter = NumberFormatter() + numberFormatter.numberStyle = .decimal + return numberFormatter + }() + + static let byteFormatter = ByteCountFormatter() + + private func formattedFileSize(_ fileSize: UInt) -> String { + FileView.byteFormatter.allowedUnits = [.useAll] + FileView.byteFormatter.countStyle = .file + return FileView.byteFormatter.string(fromByteCount: Int64(fileSize)) + } + + // Format byte count Int into string like: 23.4M (24,601,664 bytes) + private func formattedSize(byteCount: Int) -> String { + let formattedByteCount = FileDetailsView.byteCountSizeFormatter.string(from: NSNumber(value:byteCount)) ?? "0" + return "\(FileView.byteFormatter.string(fromByteCount: Int64(byteCount))) (\(formattedByteCount) bytes)" + } + + private func isEdited() -> Bool { + return self.filename != fd.name || self.comment != fd.comment + } + + private func canRename() -> Bool { + if self.fd.type == "fldr" { + return model.access?.contains(.canRenameFolders) == true + } + return model.access?.contains(.canRenameFiles) == true + } + + private func canSetComment() -> Bool { + if self.fd.type == "fldr" { + return model.access?.contains(.canSetFolderComment) == true + } + return model.access?.contains(.canSetFileComment) == true + } +} + +//#Preview { +// FileDetailsView(fd: FileDetails(name: "AppleWorks 6.sit", path: [""], size: 24601664, comment: "test comment", type: "SITD", creator: "SIT!", created: Date.now, modified: Date.now )) +//} diff --git a/Hotline/macOS/FilesView.swift b/Hotline/macOS/FilesView.swift index 397feb3..f698b5d 100644 --- a/Hotline/macOS/FilesView.swift +++ b/Hotline/macOS/FilesView.swift @@ -102,7 +102,8 @@ struct FilesView: View { @Environment(\.openWindow) private var openWindow @State private var selection: FileInfo? - + @State private var fileDetails: FileDetails? + private func openPreviewWindow(_ previewInfo: PreviewFileInfo) { switch previewInfo.previewType { case .image: @@ -206,6 +207,11 @@ struct FilesView: View { ToolbarItem(placement: .primaryAction) { Button { + if let s = selection { + model.fileDetails(s.name, path: s.path) { info in + fileDetails = info + } + } } label: { Label("Get File Info", systemImage: "info.circle") } @@ -224,6 +230,9 @@ struct FilesView: View { } } } + .sheet(item: $fileDetails ) { item in + FileDetailsView(fd: item) + } } } |