Skip to content

Commit

Permalink
Merge pull request #45 from wflixu/next
Browse files Browse the repository at this point in the history 
fix:new xlsx file can not open
  • Loading branch information
@wflixu
wflixu authored Dec 23, 2024
2 parents 8c736a5 + 4354cda commit e7c9f9b
Show file tree
Hide file tree
Showing 7 changed files with 1,173 additions and 102 deletions.
8 changes: 2 additions & 6 deletions FinderSyncExt/FinderSyncExt.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "RClick",

@MainActor
class FinderSyncExt: FIFinderSync {
// @AppLog(category: "AppState")
// private var logger


var myFolderURL = URL(fileURLWithPath: "/Users/")
var isHostAppOpen = false
Expand All @@ -37,16 +36,13 @@ class FinderSyncExt: FIFinderSync {
logger.info("FinderSync() launched from \(Bundle.main.bundlePath as NSString)")

messager.on(name: "quit") { _ in
// self.
logger.info("main app quited 。。。")

self.isHostAppOpen = false
}
messager.on(name: "running") { payload in

self.isHostAppOpen = true

// self.
logger.info("main app running\(payload.description)")
if payload.target.count > 0 {
FIFinderSyncController.default().directoryURLs = Set(payload.target.map { URL(fileURLWithPath: $0) })
}
Expand Down
76 changes: 53 additions & 23 deletions RClick.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,27 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
5C043AC32BEB7C1200C837D1 /* AppLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4288652BDA5536000C0828 /* AppLogger.swift */; };
5C0D89652D180B6200EC50E8 /* XLSXFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0D89642D180B6200EC50E8 /* XLSXFile.swift */; };
5C0D89662D180B6200EC50E8 /* XLSXFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0D89642D180B6200EC50E8 /* XLSXFile.swift */; };
5C119D072BBE9B9900B2D7C4 /* RClickApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C119D062BBE9B9900B2D7C4 /* RClickApp.swift */; };
5C119D0D2BBE9B9B00B2D7C4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C119D0C2BBE9B9B00B2D7C4 /* Assets.xcassets */; };
5C119D102BBE9B9B00B2D7C4 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C119D0F2BBE9B9B00B2D7C4 /* Preview Assets.xcassets */; };
5C119D182BBE9C8F00B2D7C4 /* MenuBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C119D172BBE9C8F00B2D7C4 /* MenuBarView.swift */; };
5C119D1A2BBE9D5700B2D7C4 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C119D192BBE9D5700B2D7C4 /* SettingsView.swift */; };
5C119D332BBEA9AC00B2D7C4 /* FinderSyncExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C119D322BBEA9AC00B2D7C4 /* FinderSyncExt.swift */; };
5C158AA92BC64654006EC625 /* GeneralSettingsTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C158AA82BC64654006EC625 /* GeneralSettingsTabView.swift */; };
5C28E72E2D1900CB00A9F4C1 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 5C28E72D2D1900CB00A9F4C1 /* ZIPFoundation */; };
5C28E7302D19018D00A9F4C1 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 5C28E72F2D19018D00A9F4C1 /* ZIPFoundation */; };
5C28E7352D190F5800A9F4C1 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 5C28E7342D190F5800A9F4C1 /* OrderedCollections */; };
5C28E7372D190F6300A9F4C1 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 5C28E7362D190F6300A9F4C1 /* OrderedCollections */; };
5C4288662BDA5536000C0828 /* AppLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4288652BDA5536000C0828 /* AppLogger.swift */; };
5C50D25A2BBED0FE00DF31AA /* AboutSettingsTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50D2592BBED0FE00DF31AA /* AboutSettingsTabView.swift */; };
5C50D2822BBFB33200DF31AA /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50D2812BBFB33200DF31AA /* StringExtension.swift */; };
5C50D28D2BBFCFF600DF31AA /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 5C50D28C2BBFCFF600DF31AA /* OrderedCollections */; };
5C50D28F2BBFD00500DF31AA /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 5C50D28E2BBFD00500DF31AA /* OrderedCollections */; };
5C50D2922BBFD11100DF31AA /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50D2812BBFB33200DF31AA /* StringExtension.swift */; };
5C68BFE12C6651B80011C096 /* Extension+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C68BFE02C6651B80011C096 /* Extension+.swift */; };
5C68BFE22C6651B80011C096 /* Extension+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C68BFE02C6651B80011C096 /* Extension+.swift */; };
Expand Down Expand Up @@ -67,6 +71,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
5C0D89642D180B6200EC50E8 /* XLSXFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XLSXFile.swift; sourceTree = "<group>"; };
5C119D032BBE9B9900B2D7C4 /* RClick.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RClick.app; sourceTree = BUILT_PRODUCTS_DIR; };
5C119D062BBE9B9900B2D7C4 /* RClickApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RClickApp.swift; sourceTree = "<group>"; };
5C119D0C2BBE9B9B00B2D7C4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -102,15 +107,17 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5C50D28D2BBFCFF600DF31AA /* OrderedCollections in Frameworks */,
5C28E72E2D1900CB00A9F4C1 /* ZIPFoundation in Frameworks */,
5C28E7372D190F6300A9F4C1 /* OrderedCollections in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5C119D2D2BBEA9AC00B2D7C4 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5C50D28F2BBFD00500DF31AA /* OrderedCollections in Frameworks */,
5C28E7352D190F5800A9F4C1 /* OrderedCollections in Frameworks */,
5C28E7302D19018D00A9F4C1 /* ZIPFoundation in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -182,6 +189,7 @@
5CC9F0992BC5445C00AF9B81 /* Messager.swift */,
5C4288652BDA5536000C0828 /* AppLogger.swift */,
5C68BFE02C6651B80011C096 /* Extension+.swift */,
5C0D89642D180B6200EC50E8 /* XLSXFile.swift */,
);
path = Shared;
sourceTree = "<group>";
Expand Down Expand Up @@ -242,7 +250,8 @@
);
name = RClick;
packageProductDependencies = (
5C50D28C2BBFCFF600DF31AA /* OrderedCollections */,
5C28E72D2D1900CB00A9F4C1 /* ZIPFoundation */,
5C28E7362D190F6300A9F4C1 /* OrderedCollections */,
);
productName = RClick;
productReference = 5C119D032BBE9B9900B2D7C4 /* RClick.app */;
Expand All @@ -262,7 +271,8 @@
);
name = FinderSyncExt;
packageProductDependencies = (
5C50D28E2BBFD00500DF31AA /* OrderedCollections */,
5C28E72F2D19018D00A9F4C1 /* ZIPFoundation */,
5C28E7342D190F5800A9F4C1 /* OrderedCollections */,
);
productName = FinderSyncExt;
productReference = 5C119D302BBEA9AC00B2D7C4 /* FinderSyncExt.appex */;
Expand Down Expand Up @@ -297,7 +307,8 @@
);
mainGroup = 5C119CFA2BBE9B9900B2D7C4;
packageReferences = (
5C50D2852BBFB47700DF31AA /* XCRemoteSwiftPackageReference "swift-collections" */,
5C28E72C2D1900CB00A9F4C1 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
5C28E7312D190EDB00A9F4C1 /* XCLocalSwiftPackageReference "../../repos/swift-collections" */,
);
productRefGroup = 5C119D042BBE9B9900B2D7C4 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -344,6 +355,7 @@
5C945D032CA50AC000DABD2C /* RCBase.swift in Sources */,
5CFA85742D1477AD0063A6A1 /* LaunchAtLogin.swift in Sources */,
5C119D1A2BBE9D5700B2D7C4 /* SettingsView.swift in Sources */,
5C0D89662D180B6200EC50E8 /* XLSXFile.swift in Sources */,
5C119D182BBE9C8F00B2D7C4 /* MenuBarView.swift in Sources */,
5CC9F09A2BC5445C00AF9B81 /* Messager.swift in Sources */,
5C4288662BDA5536000C0828 /* AppLogger.swift in Sources */,
Expand All @@ -368,6 +380,7 @@
5CC9F09B2BC5464400AF9B81 /* Messager.swift in Sources */,
5C68BFE22C6651B80011C096 /* Extension+.swift in Sources */,
5C945D072CA51B8F00DABD2C /* AppState.swift in Sources */,
5C0D89652D180B6200EC50E8 /* XLSXFile.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -517,7 +530,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2024121901;
CURRENT_PROJECT_VERSION = 2024122101;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"RClick/Preview Content\"";
DEVELOPMENT_TEAM = 4L3563XCBN;
Expand All @@ -534,7 +547,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.5.1;
MARKETING_VERSION = 1.5.2;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -553,7 +566,7 @@
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2024121901;
CURRENT_PROJECT_VERSION = 2024122101;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"RClick/Preview Content\"";
DEVELOPMENT_TEAM = "";
Expand All @@ -571,7 +584,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.5.1;
MARKETING_VERSION = 1.5.2;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = mac_app_rclick_distribution_store;
Expand All @@ -588,7 +601,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2024121901;
CURRENT_PROJECT_VERSION = 2024122101;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4L3563XCBN;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -603,7 +616,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.5.1;
MARKETING_VERSION = 1.5.2;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick.FinderSyncExt;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -620,7 +633,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2024121901;
CURRENT_PROJECT_VERSION = 2024122101;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4L3563XCBN;
Expand All @@ -636,7 +649,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.5.1;
MARKETING_VERSION = 1.5.2;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick.FinderSyncExt;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -679,26 +692,43 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
5C28E7312D190EDB00A9F4C1 /* XCLocalSwiftPackageReference "../../repos/swift-collections" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = "../../repos/swift-collections";
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
5C50D2852BBFB47700DF31AA /* XCRemoteSwiftPackageReference "swift-collections" */ = {
5C28E72C2D1900CB00A9F4C1 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/swift-collections.git";
repositoryURL = "https://github.com/weichsel/ZIPFoundation.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.1.0;
minimumVersion = 0.9.19;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
5C50D28C2BBFCFF600DF31AA /* OrderedCollections */ = {
5C28E72D2D1900CB00A9F4C1 /* ZIPFoundation */ = {
isa = XCSwiftPackageProductDependency;
package = 5C28E72C2D1900CB00A9F4C1 /* XCRemoteSwiftPackageReference "ZIPFoundation" */;
productName = ZIPFoundation;
};
5C28E72F2D19018D00A9F4C1 /* ZIPFoundation */ = {
isa = XCSwiftPackageProductDependency;
package = 5C28E72C2D1900CB00A9F4C1 /* XCRemoteSwiftPackageReference "ZIPFoundation" */;
productName = ZIPFoundation;
};
5C28E7342D190F5800A9F4C1 /* OrderedCollections */ = {
isa = XCSwiftPackageProductDependency;
package = 5C50D2852BBFB47700DF31AA /* XCRemoteSwiftPackageReference "swift-collections" */;
package = 5C28E7312D190EDB00A9F4C1 /* XCLocalSwiftPackageReference "../../repos/swift-collections" */;
productName = OrderedCollections;
};
5C50D28E2BBFD00500DF31AA /* OrderedCollections */ = {
5C28E7362D190F6300A9F4C1 /* OrderedCollections */ = {
isa = XCSwiftPackageProductDependency;
package = 5C50D2852BBFB47700DF31AA /* XCRemoteSwiftPackageReference "swift-collections" */;
package = 5C28E7312D190EDB00A9F4C1 /* XCLocalSwiftPackageReference "../../repos/swift-collections" */;
productName = OrderedCollections;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
10 changes: 5 additions & 5 deletions RClick.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"originHash" : "51f90653b2c9f9f7064c0d52159b40bf7d222e5f314be23e62fe28520fec03db",
"originHash" : "b26c070fd1f0b029780331f3cefa3909a6d58ea6b3ae242bffe49d6011fe06fe",
"pins" : [
{
"identity" : "swift-collections",
"identity" : "zipfoundation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"location" : "https://github.com/weichsel/ZIPFoundation.git",
"state" : {
"revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
"version" : "1.1.0"
"revision" : "02b6abe5f6eef7e3cbd5f247c5cc24e246efcfe0",
"version" : "0.9.19"
}
}
],
Expand Down
6 changes: 3 additions & 3 deletions RClick.xcodeproj/xcuserdata/lixu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
filePath = "RClick/RClickApp.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "198"
endingLineNumber = "198"
landmarkName = "deleteFoldorFile(_:)"
startingLineNumber = "188"
endingLineNumber = "188"
landmarkName = "createFile(rid:target:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
Expand Down
3 changes: 1 addition & 2 deletions RClick/AppState.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
//

import Foundation

import Combine
import OrderedCollections
import Combine
import SwiftUI

@MainActor
Expand Down
Loading

0 comments on commit e7c9f9b

Please sign in to comment.