Run a virtual iPhone on an Apple Silicon Mac.
Swift
allow opening symlinks pointing to folders in file manager (#156)
Huge_Black76c7c9e513f8
diff --git a/scripts/vphoned/vphoned_files.m b/scripts/vphoned/vphoned_files.mindex c58506f2..cb126e41 100644--- a/scripts/vphoned/vphoned_files.m+++ b/scripts/vphoned/vphoned_files.m@@ -28,21 +28,30 @@ NSDictionary *vp_handle_file_command(int fd, NSDictionary *msg) {NSMutableArray *entries = [NSMutableArray arrayWithCapacity:contents.count];for (NSString *name in contents) {NSString *full = [path stringByAppendingPathComponent:name];- NSDictionary *attrs = [fm attributesOfItemAtPath:full error:nil];- if (!attrs) continue;- NSString *fileType = attrs[NSFileType];+ struct stat st;+ if (lstat([full fileSystemRepresentation], &st) != 0) continue;+NSString *typeStr = @"file";- if ([fileType isEqualToString:NSFileTypeDirectory]) typeStr = @"dir";- else if ([fileType isEqualToString:NSFileTypeSymbolicLink]) typeStr = @"link";+ if (S_ISDIR(st.st_mode)) typeStr = @"dir";+ else if (S_ISLNK(st.st_mode)) typeStr = @"link";++ BOOL linkTargetsDirectory = NO;+ if (S_ISLNK(st.st_mode)) {+ struct stat resolved;+ if (stat([full fileSystemRepresentation], &resolved) == 0) {+ linkTargetsDirectory = S_ISDIR(resolved.st_mode);+ }+ }- NSNumber *size = attrs[NSFileSize] ?: @0;- NSDate *mtime = attrs[NSFileModificationDate];- NSNumber *posixPerms = attrs[NSFilePosixPermissions];+ NSNumber *size = @(st.st_size);+ NSDate *mtime = [NSDate dateWithTimeIntervalSince1970:st.st_mtimespec.tv_sec];+ NSNumber *posixPerms = @((unsigned long)st.st_mode & 0777);[entries addObject:@{@"name": name,@"type": typeStr,+ @"link_target_dir": @(linkTargetsDirectory),@"size": size,@"perm": [NSString stringWithFormat:@"%lo", [posixPerms unsignedLongValue]],@"mtime": @(mtime ? [mtime timeIntervalSince1970] : 0),diff --git a/sources/vphone-cli/VPhoneFileBrowserModel.swift b/sources/vphone-cli/VPhoneFileBrowserModel.swiftindex 5174937d..c93a440c 100644--- a/sources/vphone-cli/VPhoneFileBrowserModel.swift+++ b/sources/vphone-cli/VPhoneFileBrowserModel.swift@@ -91,7 +91,7 @@ class VPhoneFileBrowserModel {}func openItem(_ file: VPhoneRemoteFile) {- if file.isDirectory {+ if file.isDirectoryLike {navigate(to: file.path)}}diff --git a/sources/vphone-cli/VPhoneFileBrowserView.swift b/sources/vphone-cli/VPhoneFileBrowserView.swiftindex 97da226b..b514a968 100644--- a/sources/vphone-cli/VPhoneFileBrowserView.swift+++ b/sources/vphone-cli/VPhoneFileBrowserView.swift@@ -51,7 +51,7 @@ struct VPhoneFileBrowserView: View {Table(of: VPhoneRemoteFile.self, selection: $model.selection, sortOrder: $model.sortOrder) {TableColumn("", value: \.name) { file inImage(systemName: file.icon)- .foregroundStyle(file.isDirectory ? .blue : .secondary)+ .foregroundStyle(file.isDirectoryLike ? .blue : .secondary).frame(width: 20)}.width(28)@@ -72,7 +72,7 @@ struct VPhoneFileBrowserView: View {TableColumn("Size", value: \.size) { file inText(file.displaySize).font(.system(.body, design: .monospaced))- .foregroundStyle(file.isDirectory ? .secondary : .primary)+ .foregroundStyle(file.isDirectoryLike ? .secondary : .primary)}.width(min: 50, ideal: 80, max: .infinity)diff --git a/sources/vphone-cli/VPhoneRemoteFile.swift b/sources/vphone-cli/VPhoneRemoteFile.swiftindex ddf260f5..e6843cc6 100644--- a/sources/vphone-cli/VPhoneRemoteFile.swift+++ b/sources/vphone-cli/VPhoneRemoteFile.swift@@ -7,6 +7,7 @@ struct VPhoneRemoteFile: Identifiable, Hashable {let size: UInt64let permissions: Stringlet modified: Date+ let symlinkTargetsDirectory: Boolvar id: String {path@@ -24,6 +25,10 @@ struct VPhoneRemoteFile: Identifiable, Hashable {type == .symbolicLink}+ var isDirectoryLike: Bool {+ isDirectory || symlinkTargetsDirectory+ }+var displaySize: String {if isDirectory || isSymbolicLink { return "—" }return ByteCountFormatter.string(fromByteCount: Int64(size), countStyle: .file)@@ -86,6 +91,7 @@ extension VPhoneRemoteFile {self.dir = dirself.name = nameself.type = type+ symlinkTargetsDirectory = entry["link_target_dir"] as? Bool ?? falsesize = (entry["size"] as? NSNumber)?.uint64Value ?? 0permissions = entry["perm"] as? String ?? "---"modified = Date(timeIntervalSince1970: (entry["mtime"] as? Double) ?? 0)