Skip to content

feat: Implement persistent, focused root directory for sidebar with '..' navigation #136

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

Open
msavox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Implement persistent, focused root directory for sidebar with '..' navigation #136

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
9 changes: 6 additions & 3 deletions FlowVision.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,9 +644,10 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = FlowVision/FlowVision.entitlements;
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20260111;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FlowVision/Info.plist;
Expand All @@ -665,6 +666,7 @@
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = netdcy.FlowVisionDbg;
PRODUCT_NAME = "$(TARGET_NAME)Dbg";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
};
Expand All @@ -677,10 +679,10 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = FlowVision/FlowVision.entitlements;
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20260111;
DEVELOPMENT_TEAM = M9PR3WG2FN;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FlowVision/Info.plist;
Expand All @@ -699,6 +701,7 @@
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = netdcy.FlowVision;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
};
Expand Down
18 changes: 9 additions & 9 deletions FlowVision/Resources/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="24506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24506"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down Expand Up @@ -1033,7 +1033,7 @@ Gw
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="t2d-Ol-iJC"/>
</imageView>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0HQ-rx-KfT">
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0HQ-rx-KfT">
<rect key="frame" x="23" y="-24" width="234" height="24"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="XDl-gN-nwq">
Expand Down Expand Up @@ -1170,24 +1170,24 @@ Gw
<rect key="frame" x="20" y="20" width="760" height="522"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" drawsBackground="NO" id="A09-8j-haI">
<rect key="frame" x="0.0" y="0.0" width="745" height="522"/>
<rect key="frame" x="0.0" y="0.0" width="760" height="522"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView wantsLayer="YES" importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="bar" spellingCorrection="YES" smartInsertDelete="YES" id="Hvc-43-Pyw">
<rect key="frame" x="0.0" y="0.0" width="745" height="522"/>
<rect key="frame" x="0.0" y="0.0" width="760" height="522"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="745" height="522"/>
<size key="minSize" width="760" height="522"/>
<size key="maxSize" width="760" height="10000000"/>
</textView>
</subviews>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="2fu-s8-8On">
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="2fu-s8-8On">
<rect key="frame" x="-100" y="-100" width="225" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="SXi-ew-SdF">
<rect key="frame" x="745" y="0.0" width="15" height="522"/>
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="SXi-ew-SdF">
<rect key="frame" x="743" y="0.0" width="17" height="522"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
Expand Down
12 changes: 12 additions & 0 deletions FlowVision/Sources/Common/DataModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,18 @@ class TreeViewModel {
let oldChildren=node.children
node.children=[]

// Add ".." entry to navigate up
if folderURL.path != "/" && folderURL.path != "root" {
let parentURL = folderURL.deletingLastPathComponent()
// Ensure we don't add ".." if the parent is the same as the current node
// (can happen with trailing slashes)
if parentURL.standardizedFileURL != folderURL.standardizedFileURL {
let parentNode = TreeNode(name: "..", fullPath: parentURL.absoluteString)
parentNode.hasChild = true // So it's always expandable
node.children?.append(parentNode)
}
}

for subFolder in subFolders {
var name = subFolder.lastPathComponent
var fullPath = subFolder.absoluteString
Expand Down
60 changes: 47 additions & 13 deletions FlowVision/Sources/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,10 +611,22 @@ class ViewController: NSViewController, NSSplitViewDelegate, NSSearchFieldDelega
largeImageView.imageView.preferredImageDynamicRange = (publicVar.isEnableHDR) ? .high : .standard
}

mainScrollView.scrollerStyle = .legacy
outlineScrollView.scrollerStyle = .legacy
// Read the custom start directory from preferences, otherwise default to home directory
let userDefaults = UserDefaults.standard
var startPath = userDefaults.string(forKey: "startDirectoryPath")

if startPath == nil || startPath!.isEmpty {
startPath = NSHomeDirectory()
} else {
// Ensure the saved path is a valid directory
var isDir: ObjCBool = false
if !FileManager.default.fileExists(atPath: startPath!, isDirectory: &isDir) || !isDir.boolValue {
startPath = NSHomeDirectory() // Fallback to home if saved path is invalid
}
}

treeViewData.initData(path: treeRootFolder)
// Initialize the tree with the determined path
treeViewData.initData(path: startPath!)
outlineView.reloadData()
DispatchQueue.main.async {
self.outlineViewManager.adjustColumnWidth()
Expand Down Expand Up @@ -986,22 +998,44 @@ class ViewController: NSViewController, NSSplitViewDelegate, NSSearchFieldDelega
}

@objc func outlineViewDoubleClicked(_ sender: AnyObject) {
// 获取当前选中的行
let row = outlineView.clickedRow
guard row != -1, let item = outlineView.item(atRow: row) as? TreeNode else {
return
}

// 确保点击的是有效行
if row == -1 {
guard let url = URL(string: item.fullPath) else { return }

// Handle special cases like virtual tags
if url.scheme != "file" {
// This is not a filesystem path, just do the default selection action
outlineViewManager.itemSelected(item)
return
}

let path = url.path

var isDir: ObjCBool = false
if FileManager.default.fileExists(atPath: path, isDirectory: &isDir), isDir.boolValue {
changeTreeRoot(to: path)
}
}

// 获取行对应的条目
if let item = outlineView.item(atRow: row) {
if outlineView.isItemExpanded(item) {
outlineView.collapseItem(item)
} else {
outlineView.expandItem(item)
}
func changeTreeRoot(to newRootPath: String) {
// Persist the new root path
UserDefaults.standard.set(newRootPath, forKey: "startDirectoryPath")

// Re-initialize the tree data model with the new path
treeViewData.initData(path: newRootPath)
outlineView.reloadData()

// Use a dispatch queue to allow the reload to complete before adjusting width
DispatchQueue.main.async {
self.outlineViewManager.adjustColumnWidth()
}

// Also switch the main view to this new root directory
let destUrl = URL(fileURLWithPath: newRootPath).absoluteString
switchDirByDirection(direction: .zero, dest: destUrl, doCollapse: false, expandLast: false, skip: false, stackDeep: 0)
}

override func viewDidLayout() {
Expand Down