Skip to content

Improved File Handling System #1341

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

Jump to bottom
Closed
Wouter01 wants to merge 35 commits into from
Closed

Improved File Handling System #1341

Wouter01 wants to merge 35 commits into from

Conversation

@Wouter01
Copy link
Member

@Wouter01 Wouter01 commented Jun 20, 2023 •
edited
Loading

Description

Rewrite of the file handling system.

The current file handling system starts to get slow for larger projects. This is noticeable to the user by the slow startup times of codeedit, slower file moving in larger projects, etc. A new file handling system is added which is more performant. It also makes more use of the capabilities of NSDocument, simplyfying things.

Related Issues

Checklist

  • I read and understood the contributing guide as well as the code of conduct
  • The issues this PR addresses are related to each other
  • My changes generate no new warnings
  • My code builds and runs on my machine
  • My changes are all related to the related issue above
  • I documented my code

Screenshots

Wouter01 added 10 commits June 19, 2023 14:48
@Wouter01
reduce filemanager usages
74c019a 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Cleanup of unused code
95cc504 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Make parent weak
7112862 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
partially moved over to workspacedocument
fd1f796 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
First working version
24db8c4 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Fixed name change
5bc004d 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
cleanup, comments, error handling
ca99d6a 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
fix for folder ignoring
01a3fc7 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Partially adopted UI for new file system
94ba650 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Refactoring
4412ef5 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01 Wouter01 changed the title Filemanager actor Improved File Handling System Jun 20, 2023
@Rachmaye
Copy link

Rachmaye commented Jun 20, 2023

Wowzer

Wouter01 added 7 commits June 20, 2023 12:54
@Wouter01
Add task cancellation
e36fb1a 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
fixed concurrency issues
e467900 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Fix color
2e09b81 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Rename ResourceData to Resource
4a479cf 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
concurrency fixes
c9e8d8d 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
merged similar functions
198434e 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Merge branch 'main' into filemanager-actor
b44af63 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
matthijseikelenboom
matthijseikelenboom reviewed Jun 20, 2023
View reviewed changes
CodeEdit/Features/CEWorkspace/Models/Resource.swift Outdated
import AppKit
import SwiftUI

protocol Resource: AnyObject, Identifiable {
Copy link
Contributor

@matthijseikelenboom matthijseikelenboom Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering on whether the term Resource is too arbitrary

Copy link
Member Author

@Wouter01 Wouter01 Jun 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to suggest better names :) I chose this because it's used a lot throughout the codebase and is memorizable (compared to, for example, CEWorkspaceFile)

Copy link
Member Author

@Wouter01 Wouter01 Jun 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apple's docs also refer to filesystem items as resources

Wouter01 added 10 commits June 21, 2023 03:19
@Wouter01
Added file identifier
e9268fa 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
move to fileResourceTypeKey
09e69b9 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Fixed editor, tabbar, and much more
5ae9808 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Merge branch 'main' into filemanager-actor
8de69da 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>

# Conflicts:
#	CodeEdit/Features/InspectorSidebar/InspectorSidebarView.swift
#	CodeEdit/Features/NavigatorSidebar/OutlineView/FileSystemTableViewCell.swift
#	CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/ProjectNavigatorTableViewCell.swift
#	CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/ProjectNavigatorViewController+OutlineTableViewCellDelegate.swift
@Wouter01
merge fixes
3b6270c 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
increased task priority
8d65acd 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Merge branch 'main' into filemanager-actor
c48886f 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>

# Conflicts:
#	CodeEdit/Features/Documents/Views/WorkspaceCodeFileView.swift
#	CodeEdit/Features/InspectorSidebar/Views/FileInspectorView.swift
#	CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift
@Wouter01
fixed path bar
3c73353 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Fixed openquickly overlay
c29ebf2 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Fixed document opening
7113ee4 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
Wouter01 added 8 commits June 25, 2023 03:03
@Wouter01
outlineview fixes
9340dd8 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Changed ID from URL to UInt64
bd1c9b6 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
outlineview fixes
d64eca1 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
removed old code
7cf48fa 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Improved document loading
cd5e24a 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
fixed reveal in project navigator
6202bc1 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
added filemap
5152e6b 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@Wouter01
Improve performance of quickopenviewmodel
62410d3 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@austincondiff
Copy link
Collaborator

austincondiff commented Aug 16, 2023

What is the status of this PR?

@Wouter01
Copy link
Member Author

Wouter01 commented Aug 16, 2023

What is the status of this PR?

It's 80% done, but I currently don't have the time to resume working on it

@austincondiff
Copy link
Collaborator

austincondiff commented Aug 16, 2023 •
edited
Loading

So close! That is okay, I totally understand. Do you have any idea when you might get the time in the future? Depending, it may be best to close this for the time being and reopen when that time comes. What do you think?

@Wouter01
Copy link
Member Author

Wouter01 commented Aug 16, 2023

So close! That is okay, I totally understand. Do you have any idea when you might get the time in the future? Depending, it may be best to close this for the time being and reopen when that time comes. What do you think?

Maybe in September, but I can't promise anything 😅. It's fine for me to close this PR for now, but it's probably best that a linked issue is created so the work doesn't get lost. Also, branches are removed from time to time, so I'm hoping this one doesn't get deleted. I have a local copy though

@austincondiff
Copy link
Collaborator

austincondiff commented Aug 16, 2023

In that case, we can keep this PR open. It may help to keep it updated from time to time though so you don't end up with major conflicts down the road.

@thecoolwinter
Copy link
Collaborator

thecoolwinter commented Sep 23, 2023

Closing this as discussed with @Wouter01. This will be implemented but the current fork is too far behind CE to be merged without a lot of pain.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthijseikelenboom matthijseikelenboom matthijseikelenboom left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Wouter01 @Rachmaye @austincondiff @thecoolwinter @matthijseikelenboom