Skip to content

Improve File Extension Logic #811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2023
Merged

Improve File Extension Logic #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CodeApp/Managers/MainApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,9 @@ class MainApp: ObservableObject {
}

private func createExtensionEditorFromURL(url: URL) throws -> EditorInstance {
guard url.lastPathComponent.contains(".") else {
throw AppError.unknownFileFormat
}
let fileExtension =
url.lastPathComponent.components(separatedBy: ".").last?.lowercased() ?? ""
let provider = extensionManager.editorProviderManager.providers.first {
Expand Down
63 changes: 36 additions & 27 deletions CodeApp/Views/FileIcon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ private let extensionNames = [
"stylelintrc.yml": "stylelint", "stylelintrc.js": "stylelint", "stylelintignore": "stylelint",
"direnv": "config", "env": "config", "static": "config", "editorconfig": "config",
"slugignore": "config", "tmp": "clock", "htaccess": "config", "key": "lock", "cert": "lock",
"DS_Store": "ignored", "svelte": "svelte",
"DS_Store": "ignored", "svelte": "svelte", "mjs": "javascript", "cjs": "javascript",
"mts": "typescript", "cts": "typescript"
]
private let level2ExtensionNames = [
"css.map": "css", "js.map": "javascript", "spec.js": "javascript_yellow",
Expand All @@ -78,7 +79,11 @@ private let level2ExtensionNames = [
"stylelintrc.json": "stylelint", "stylelintrc.yaml": "stylelint",
"stylelintrc.yml": "stylelint", "stylelintrc.js": "stylelint",
]
private let fileNames = ["LICENSE": "license", "README.md": "info"]
private let fileNames = [
"license": "license", "licence": "license", "license.txt": "license", "licence.txt": "license",
"license.md": "license", "licence.md": "license", "readme.txt": "info", "readme.md": "info",
"readme": "info"
]

struct FileIcon: View {
let url: String
Expand All @@ -87,22 +92,18 @@ struct FileIcon: View {
@Environment(\.sizeCategory) var sizeCategory

var body: some View {
let fileName = url.components(separatedBy: "/").last ?? ""
switch fileName {
case let x where fileNames[x] != nil:
Image(fileNames[x]!).resizable().frame(width: iconSize + 6, height: iconSize + 6)
case let x
where
level2ExtensionNames[
x.lowercased().components(separatedBy: ".").dropFirst().joined(separator: ".")]
!= nil:
Image(
level2ExtensionNames[
x.lowercased().components(separatedBy: ".").dropFirst().joined(
separator: ".")]!
).resizable().frame(width: iconSize + 6, height: iconSize + 6)
default:
switch fileName.lowercased().components(separatedBy: ".").last ?? "" {
let fileName = url.components(separatedBy: "/").last?.lowercased() ?? ""
if let image = fileNames[fileName] {
Image(image)
.resizable()
.frame(width: iconSize + 6, height: iconSize + 6)
} else if let image = level2ExtensionNames[
fileName.components(separatedBy: ".").suffix(2).joined(separator: ".")] {
Image(image)
.resizable()
.frame(width: iconSize + 6, height: iconSize + 6)
} else if fileName.contains(".") {
switch fileName.components(separatedBy: ".").last ?? "" {
case "swift":
Image(systemName: "swift")
.foregroundColor(.orange)
Expand All @@ -118,17 +119,25 @@ struct FileIcon: View {
.foregroundColor(.gray)
.font(.system(size: iconSize - 2))
.frame(width: iconSize + 6, height: iconSize + 6)
case let x where extensionNames[x] != nil:
Image(extensionNames[x]!)
.resizable()
.frame(width: iconSize + 6, height: iconSize + 6)
case "icloud":
Image(systemName: "icloud.and.arrow.down").foregroundColor(.gray).font(
.system(size: iconSize - 2))
default:
Image(systemName: "text.alignleft").foregroundColor(.gray).font(
.system(size: iconSize - 2))
Image(systemName: "icloud.and.arrow.down")
.foregroundColor(.gray)
.font(.system(size: iconSize - 2))
case let x:
if let image = extensionNames[x] {
Image(image)
.resizable()
.frame(width: iconSize + 6, height: iconSize + 6)
} else {
Image(systemName: "text.alignleft")
.foregroundColor(.gray)
.font(.system(size: iconSize - 2))
}
}
} else {
Image(systemName: "text.alignleft")
.foregroundColor(.gray)
.font(.system(size: iconSize - 2))
}
}
}
2 changes: 1 addition & 1 deletion CodeApp/Views/NewFileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ struct NewFileView: View {
default:
if name.contains(".") {
name = returnFileName(
defaultName: name.components(separatedBy: ".").dropLast().joined(),
defaultName: name.components(separatedBy: ".").dropLast().joined(separator: "."),
extensionName: name.components(separatedBy: ".").last ?? "")
}
content = ""
Expand Down
2 changes: 1 addition & 1 deletion Extensions/ImageViewer/ImageViewerExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ImageViewerExtension: CodeAppExtension {
override func onInitialize(app: MainApp, contribution: CodeAppExtension.Contribution) {
let provider = EditorProvider(
registeredFileExtensions: [
"png", "tiff", "tif", "jpeg", "jpg", "gif", "bmp", "bmp", "BMPf", "ico", "cur",
"png", "tiff", "tif", "jpeg", "jpg", "gif", "bmp", "bmpf", "ico", "cur",
"xbm", "heic", "webp",
],
onCreateEditor: { [weak self] url in
Expand Down