Add gpx type, fix file replacement
This commit is contained in:
parent
3c7681b769
commit
f3de1b72b6
@ -108,7 +108,11 @@ final class FileResource: Item, LocalizedItem {
|
||||
}
|
||||
|
||||
func save(textContent: String) -> Bool {
|
||||
content.storage.save(fileContent: textContent, for: id)
|
||||
guard content.storage.save(fileContent: textContent, for: id) else {
|
||||
return false
|
||||
}
|
||||
modifiedDate = .now
|
||||
return true
|
||||
}
|
||||
|
||||
func dataContent() -> Foundation.Data? {
|
||||
|
@ -90,6 +90,8 @@ enum FileType: String {
|
||||
|
||||
case txt
|
||||
|
||||
case gpx
|
||||
|
||||
// MARK: Model
|
||||
|
||||
case stl
|
||||
@ -164,7 +166,7 @@ enum FileType: String {
|
||||
return .video
|
||||
case .mp3, .aac, .m4b, .m4a:
|
||||
return .audio
|
||||
case .json, .conf, .yaml, .txt:
|
||||
case .json, .conf, .yaml, .txt, .gpx:
|
||||
return .text
|
||||
case .html, .cpp, .swift, .sh, .js, .css:
|
||||
return .code
|
||||
|
@ -41,7 +41,7 @@ struct FileContentView: View {
|
||||
.foregroundStyle(.secondary)
|
||||
case .text, .code:
|
||||
TextFileContentView(file: file)
|
||||
.id(file.id)
|
||||
.id(file.id + file.modifiedDate.description)
|
||||
case .video:
|
||||
VStack {
|
||||
if let image = file.imageToDisplay {
|
||||
|
@ -11,6 +11,9 @@ struct TextFileContentView: View {
|
||||
@State
|
||||
private var loadedFile: String?
|
||||
|
||||
@State
|
||||
private var loadedFileDate: Date = .now
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
if fileContent != "" {
|
||||
@ -47,6 +50,7 @@ struct TextFileContentView: View {
|
||||
private func reload() {
|
||||
fileContent = file.textContent()
|
||||
loadedFile = file.id
|
||||
loadedFileDate = file.modifiedDate
|
||||
print("Loaded content of file \(file.id)")
|
||||
}
|
||||
|
||||
@ -57,6 +61,12 @@ struct TextFileContentView: View {
|
||||
}
|
||||
guard loadedFile == file.id else {
|
||||
print("[ERROR] Text File View: Not saving since file changed")
|
||||
reload()
|
||||
return
|
||||
}
|
||||
guard loadedFileDate == file.modifiedDate else {
|
||||
print("Text File View: Not saving changed file \(file.id)")
|
||||
reload()
|
||||
return
|
||||
}
|
||||
guard fileContent != "" else {
|
||||
@ -67,6 +77,7 @@ struct TextFileContentView: View {
|
||||
print("[ERROR] Text File View: Failed to save file \(file.id)")
|
||||
return
|
||||
}
|
||||
loadedFileDate = file.modifiedDate
|
||||
print("Text File View: Saved file \(file.id)")
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user