Skip to content
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

Fix rename feature #3

Merged
merged 9 commits into from
Jan 25, 2024
Merged

Fix rename feature #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d8c2a2
feat: implement rename/move
marmos91 Jan 23, 2024
a8cebd3
feat: use NSFileProvider temporaryFolder method
marmos91 Jan 23, 2024
fe4eed4
feat: refactor DS3DriveManager
marmos91 Jan 23, 2024
ffa72a4
feat: improve upload and listing
marmos91 Jan 23, 2024
533c26e
fix: rename empty folders
marmos91 Jan 23, 2024
dfd7622
fix: folder rename
marmos91 Jan 24, 2024
85c1809
chore: refactor S3Lib
marmos91 Jan 25, 2024
7569bf5
feat: add withRetries utility
marmos91 Jan 25, 2024
a1ae3d5
feat: add retries to s3Lib
marmos91 Jan 25, 2024
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
20 changes: 12 additions & 8 deletions CubbitDS3Sync.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@

/* Begin PBXBuildFile section */
D512EEBC2B59631400F550EC /* MFAView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D512EEBB2B59631400F550EC /* MFAView.swift */; };
D54002A02B5EAEB000B54E97 /* S3Lib.swift in Sources */ = {isa = PBXBuildFile; fileRef = D540029D2B5EAEB000B54E97 /* S3Lib.swift */; };
D546D5462B5916CC00231120 /* NoBucketsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D546D5452B5916CC00231120 /* NoBucketsView.swift */; };
D546D5482B59214200231120 /* BucketErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D546D5472B59214200231120 /* BucketErrorView.swift */; };
D54775C72B57181D00DABCD4 /* CubbitDS3SyncApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D54775C62B57181D00DABCD4 /* CubbitDS3SyncApp.swift */; };
D54775D72B57185100DABCD4 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = D54775D52B57185100DABCD4 /* README.md */; };
D54775D82B57185100DABCD4 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = D54775D62B57185100DABCD4 /* LICENSE */; };
D59B743C2B62690B0088605A /* ControlFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = D59B743B2B62690B0088605A /* ControlFlow.swift */; };
D59B743D2B62690B0088605A /* ControlFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = D59B743B2B62690B0088605A /* ControlFlow.swift */; };
D5A221462B571F1700F1413B /* DS3Lib.h in Headers */ = {isa = PBXBuildFile; fileRef = D5A221452B571F1700F1413B /* DS3Lib.h */; settings = {ATTRIBUTES = (Public, ); }; };
D5A221492B571F1700F1413B /* DS3Lib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5A221432B571F1700F1413B /* DS3Lib.framework */; };
D5A2214B2B571F1700F1413B /* DS3Lib.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D5A221432B571F1700F1413B /* DS3Lib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -166,12 +169,10 @@
D5A222792B57217E00F1413B /* DefaultSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A221512B571F5100F1413B /* DefaultSettings.swift */; };
D5A2227A2B57217E00F1413B /* URLs.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A221522B571F5100F1413B /* URLs.swift */; };
D5A222862B5721CC00F1413B /* FileProviderExtension+Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A2227C2B5721CC00F1413B /* FileProviderExtension+Errors.swift */; };
D5A222882B5721CC00F1413B /* S3Enumerator+S3.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A2227F2B5721CC00F1413B /* S3Enumerator+S3.swift */; };
D5A222892B5721CC00F1413B /* S3Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A222802B5721CC00F1413B /* S3Item.swift */; };
D5A2228A2B5721CC00F1413B /* S3Enumerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A222812B5721CC00F1413B /* S3Enumerator.swift */; };
D5A2228B2B5721CC00F1413B /* S3Item+Metadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A222822B5721CC00F1413B /* S3Item+Metadata.swift */; };
D5A2228C2B5721CC00F1413B /* Provider.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D5A222832B5721CC00F1413B /* Provider.xcassets */; };
D5A2228E2B5721CC00F1413B /* FileProviderExtension+S3.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A222852B5721CC00F1413B /* FileProviderExtension+S3.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -236,13 +237,15 @@

/* Begin PBXFileReference section */
D512EEBB2B59631400F550EC /* MFAView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFAView.swift; sourceTree = "<group>"; };
D540029D2B5EAEB000B54E97 /* S3Lib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = S3Lib.swift; sourceTree = "<group>"; };
D546D5452B5916CC00231120 /* NoBucketsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoBucketsView.swift; sourceTree = "<group>"; };
D546D5472B59214200231120 /* BucketErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BucketErrorView.swift; sourceTree = "<group>"; };
D54775C32B57181D00DABCD4 /* Cubbit DS3.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Cubbit DS3.app"; sourceTree = BUILT_PRODUCTS_DIR; };
D54775C62B57181D00DABCD4 /* CubbitDS3SyncApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CubbitDS3SyncApp.swift; sourceTree = "<group>"; };
D54775CC2B57181E00DABCD4 /* CubbitDS3Sync.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CubbitDS3Sync.entitlements; sourceTree = "<group>"; };
D54775D52B57185100DABCD4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
D54775D62B57185100DABCD4 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
D59B743B2B62690B0088605A /* ControlFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlFlow.swift; sourceTree = "<group>"; };
D5A2213D2B571D5E00F1413B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
D5A221432B571F1700F1413B /* DS3Lib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DS3Lib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D5A221452B571F1700F1413B /* DS3Lib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DS3Lib.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -336,12 +339,10 @@
D5A2224E2B57211500F1413B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D5A2227C2B5721CC00F1413B /* FileProviderExtension+Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FileProviderExtension+Errors.swift"; sourceTree = "<group>"; };
D5A2227E2B5721CC00F1413B /* Provider.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Provider.entitlements; sourceTree = "<group>"; };
D5A2227F2B5721CC00F1413B /* S3Enumerator+S3.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "S3Enumerator+S3.swift"; sourceTree = "<group>"; };
D5A222802B5721CC00F1413B /* S3Item.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = S3Item.swift; sourceTree = "<group>"; };
D5A222812B5721CC00F1413B /* S3Enumerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = S3Enumerator.swift; sourceTree = "<group>"; };
D5A222822B5721CC00F1413B /* S3Item+Metadata.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "S3Item+Metadata.swift"; sourceTree = "<group>"; };
D5A222832B5721CC00F1413B /* Provider.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Provider.xcassets; sourceTree = "<group>"; };
D5A222852B5721CC00F1413B /* FileProviderExtension+S3.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FileProviderExtension+S3.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -476,6 +477,7 @@
D5A2216D2B571F5100F1413B /* System.swift */,
D5A2216E2B571F5100F1413B /* URLs+Extensions.swift */,
D5A2216F2B571F5100F1413B /* Bundle+Extensions.swift */,
D59B743B2B62690B0088605A /* ControlFlow.swift */,
);
path = Utils;
sourceTree = "<group>";
Expand Down Expand Up @@ -811,11 +813,10 @@
children = (
D5A222482B57211500F1413B /* FileProviderExtension.swift */,
D5A2227C2B5721CC00F1413B /* FileProviderExtension+Errors.swift */,
D5A222852B5721CC00F1413B /* FileProviderExtension+S3.swift */,
D5A222802B5721CC00F1413B /* S3Item.swift */,
D5A222822B5721CC00F1413B /* S3Item+Metadata.swift */,
D5A222812B5721CC00F1413B /* S3Enumerator.swift */,
D5A2227F2B5721CC00F1413B /* S3Enumerator+S3.swift */,
D540029D2B5EAEB000B54E97 /* S3Lib.swift */,
D5A222832B5721CC00F1413B /* Provider.xcassets */,
D5A2227E2B5721CC00F1413B /* Provider.entitlements */,
D5A2224E2B57211500F1413B /* Info.plist */,
Expand Down Expand Up @@ -875,6 +876,8 @@
dependencies = (
);
name = DS3Lib;
packageProductDependencies = (
);
productName = DS3Lib;
productReference = D5A221432B571F1700F1413B /* DS3Lib.framework */;
productType = "com.apple.product-type.framework";
Expand Down Expand Up @@ -1074,6 +1077,7 @@
buildActionMask = 2147483647;
files = (
D5A221772B571F5100F1413B /* AccountSession.swift in Sources */,
D59B743C2B62690B0088605A /* ControlFlow.swift in Sources */,
D5A221782B571F5100F1413B /* Challenge.swift in Sources */,
D5A221752B571F5100F1413B /* IAMUser.swift in Sources */,
D5A221792B571F5100F1413B /* Project.swift in Sources */,
Expand Down Expand Up @@ -1109,11 +1113,12 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D54002A02B5EAEB000B54E97 /* S3Lib.swift in Sources */,
D59B743D2B62690B0088605A /* ControlFlow.swift in Sources */,
D5A222492B57211500F1413B /* FileProviderExtension.swift in Sources */,
D5A222742B57217900F1413B /* Challenge.swift in Sources */,
D5A222892B5721CC00F1413B /* S3Item.swift in Sources */,
D5A222702B57217900F1413B /* Account.swift in Sources */,
D5A2228E2B5721CC00F1413B /* FileProviderExtension+S3.swift in Sources */,
D5A2226B2B57217400F1413B /* SharedData+account.swift in Sources */,
D5A222712B57217900F1413B /* DS3APIKey.swift in Sources */,
D5A222722B57217900F1413B /* RefreshToken.swift in Sources */,
Expand All @@ -1130,7 +1135,6 @@
D5A2228B2B5721CC00F1413B /* S3Item+Metadata.swift in Sources */,
D5A222762B57217900F1413B /* Token.swift in Sources */,
D5A2226C2B57217400F1413B /* SharedData+apiKeys.swift in Sources */,
D5A222882B5721CC00F1413B /* S3Enumerator+S3.swift in Sources */,
D5A2226F2B57217900F1413B /* IAMUser.swift in Sources */,
D5A222602B57216F00F1413B /* NSFIleProvider+Extensions.swift in Sources */,
D5A2225F2B57216B00F1413B /* DS3Authentication.swift in Sources */,
Expand Down
77 changes: 77 additions & 0 deletions CubbitDS3Sync.xcodeproj/xcshareddata/xcschemes/CubbitDS3Sync.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D54775C22B57181D00DABCD4"
BuildableName = "Cubbit DS3.app"
BlueprintName = "CubbitDS3Sync"
ReferencedContainer = "container:CubbitDS3Sync.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D54775C22B57181D00DABCD4"
BuildableName = "Cubbit DS3.app"
BlueprintName = "CubbitDS3Sync"
ReferencedContainer = "container:CubbitDS3Sync.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D54775C22B57181D00DABCD4"
BuildableName = "Cubbit DS3.app"
BlueprintName = "CubbitDS3Sync"
ReferencedContainer = "container:CubbitDS3Sync.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
95 changes: 95 additions & 0 deletions CubbitDS3Sync.xcodeproj/xcshareddata/xcschemes/Provider.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5A222422B57211500F1413B"
BuildableName = "Provider.appex"
BlueprintName = "Provider"
ReferencedContainer = "container:CubbitDS3Sync.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D54775C22B57181D00DABCD4"
BuildableName = "Cubbit DS3.app"
BlueprintName = "CubbitDS3Sync"
ReferencedContainer = "container:CubbitDS3Sync.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
askForAppToLaunch = "Yes"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D54775C22B57181D00DABCD4"
BuildableName = "Cubbit DS3.app"
BlueprintName = "CubbitDS3Sync"
ReferencedContainer = "container:CubbitDS3Sync.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D54775C22B57181D00DABCD4"
BuildableName = "Cubbit DS3.app"
BlueprintName = "CubbitDS3Sync"
ReferencedContainer = "container:CubbitDS3Sync.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
1 change: 1 addition & 0 deletions CubbitDS3Sync/CubbitDS3SyncApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ struct ds3syncApp: App {
account: ds3Authentication.account!
)
)
.environment(ds3DriveManager)
}
}
.windowResizability(.contentSize)
Expand Down
Loading
Loading