Skip to content

[pull] main from intitni:main #16

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
pull merged 3 commits into from
Aug 1, 2023
Merged

[pull] main from intitni:main #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e230e4
Disallow reading files larger than 15MB in notifyOpenTextDocument
intitni Aug 1, 2023
a211955
Ignore mlmodel files when creating Filespace
intitni Aug 1, 2023
7fa92e0
Merge branch 'hotfix/disallow-reading-large-files'
intitni Aug 1, 2023
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
19 changes: 19 additions & 0 deletions Core/Sources/Service/Workspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,13 @@ final class Workspace {
"Suggestion feature is disabled for this project."
}
}

struct UnsupportedFileError: Error, LocalizedError {
var extensionName: String
var errorDescription: String? {
"File type \(extensionName) unsupported."
}
}

let projectRootURL: URL
let openedFileRecoverableStorage: OpenedFileRecoverableStorage
Expand Down Expand Up @@ -223,6 +230,11 @@ final class Workspace {
static func fetchOrCreateWorkspaceIfNeeded(fileURL: URL) async throws
-> (workspace: Workspace, filespace: Filespace)
{
let ignoreFileExtensions = ["mlmodel"]
if ignoreFileExtensions.contains(fileURL.pathExtension) {
throw UnsupportedFileError(extensionName: fileURL.pathExtension)
}

// If we know which project is opened.
if let currentProjectURL = try await Environment.fetchCurrentProjectRootURLFromXcode() {
if let existed = workspaces[currentProjectURL] {
Expand Down Expand Up @@ -401,6 +413,13 @@ extension Workspace {
refreshUpdateTime()
openedFileRecoverableStorage.openFile(fileURL: filespace.fileURL)
Task {
// check if file size is larger than 15MB, if so, return immediately
if let attrs = try? FileManager.default
.attributesOfItem(atPath: filespace.fileURL.path),
let fileSize = attrs[FileAttributeKey.size] as? UInt64,
fileSize > 15 * 1024 * 1024
{ return }

try await suggestionService?.notifyOpenTextDocument(
fileURL: filespace.fileURL,
content: try String(contentsOf: filespace.fileURL, encoding: .utf8)
Expand Down