Skip to content

Commit 4d9c211

Browse files
mpivchevmpivchev
committed
Refactor
Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com>
1 parent 9c26f98 commit 4d9c211

File tree

13 files changed

+27
-27
lines changed

13 files changed

+27
-27
lines changed

‎File Provider Extension/FileProviderExtension+Actions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ extension FileProviderExtension {
207207
}
208208

209209
if (favorite == true && !metadata.favorite) || (!favorite && metadata.favorite) {
210-
let fileNamePath = NCUtilityFileSystem().getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId)
210+
let fileNamePath = NCUtilityFileSystem().getRelativeFilePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId)
211211
let resultsFavorite = await NextcloudKit.shared.setFavoriteAsync(fileName: fileNamePath, favorite: favorite, account: metadata.account)
212212

213213
if resultsFavorite.error == .success {

‎iOSClient/DeepLink/NCDeepLinkHandler.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class NCDeepLinkHandler {
116116
DispatchQueue.main.asyncAfter(deadline: .now() + 4) {
117117
let serverUrl = controller.currentServerUrl()
118118
let session = NCSession.shared.getSession(controller: controller)
119-
let fileFolderPath = NCUtilityFileSystem().getFileNamePath("", serverUrl: serverUrl, session: session)
119+
let fileFolderPath = NCUtilityFileSystem().getRelativeFilePath("", serverUrl: serverUrl, session: session)
120120
let fileFolderName = (serverUrl as NSString).lastPathComponent
121121
let capabilities = NCNetworking.shared.capabilities[controller.account] ?? NKCapabilities.Capabilities()
122122

‎iOSClient/Main/NCMainNavigationController.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
357357
image: utility.loadImage(named: "doc.text", colors: [NCBrandColor.shared.iconImageColor])) { _ in
358358
Task {
359359
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + creator.ext, account: session.account, serverUrl: serverUrl)
360-
let fileNamePath = utilityFileSystem.getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
360+
let fileNamePath = utilityFileSystem.getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
361361

362362
await NCCreate().createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "text", creatorId: creator.identifier, templateId: "document", account: session.account)
363363
}
@@ -377,7 +377,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
377377
let createDocument = NCCreate()
378378
let templates = await createDocument.getTemplate(editorId: "collabora", templateId: "document", account: session.account)
379379
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + templates.ext, account: session.account, serverUrl: serverUrl)
380-
let fileNamePath = utilityFileSystem.getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
380+
let fileNamePath = utilityFileSystem.getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
381381

382382
await createDocument.createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "collabora", templateId: templates.selectedTemplate.identifier, account: session.account)
383383
}
@@ -389,7 +389,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
389389
let createDocument = NCCreate()
390390
let templates = await createDocument.getTemplate(editorId: "collabora", templateId: "spreadsheet", account: session.account)
391391
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + templates.ext, account: session.account, serverUrl: serverUrl)
392-
let fileNamePath = utilityFileSystem.getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
392+
let fileNamePath = utilityFileSystem.getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
393393

394394
await createDocument.createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "collabora", templateId: templates.selectedTemplate.identifier, account: session.account)
395395
}
@@ -401,7 +401,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
401401
let createDocument = NCCreate()
402402
let templates = await createDocument.getTemplate(editorId: "collabora", templateId: "presentation", account: session.account)
403403
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + templates.ext, account: session.account, serverUrl: serverUrl)
404-
let fileNamePath = utilityFileSystem.getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
404+
let fileNamePath = utilityFileSystem.getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
405405

406406
await createDocument.createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "collabora", templateId: templates.selectedTemplate.identifier, account: session.account)
407407
}
@@ -417,7 +417,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
417417
let createDocument = NCCreate()
418418
let templates = await createDocument.getTemplate(editorId: "onlyoffice", templateId: "document", account: session.account)
419419
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + templates.ext, account: session.account, serverUrl: serverUrl)
420-
let fileNamePath = utilityFileSystem.getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
420+
let fileNamePath = utilityFileSystem.getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
421421

422422
await createDocument.createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "onlyoffice", creatorId: creator.identifier, templateId: templates.selectedTemplate.identifier, account: session.account)
423423
}
@@ -431,7 +431,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
431431
let createDocument = NCCreate()
432432
let templates = await createDocument.getTemplate(editorId: "onlyoffice", templateId: "spreadsheet", account: session.account)
433433
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + templates.ext, account: session.account, serverUrl: serverUrl)
434-
let fileNamePath = utilityFileSystem.getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
434+
let fileNamePath = utilityFileSystem.getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
435435

436436
await createDocument.createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "onlyoffice", creatorId: creator.identifier, templateId: templates.selectedTemplate.identifier, account: session.account)
437437
}
@@ -446,7 +446,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
446446
let createDocument = NCCreate()
447447
let templates = await createDocument.getTemplate(editorId: "onlyoffice", templateId: "presentation", account: session.account)
448448
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + templates.ext, account: session.account, serverUrl: serverUrl)
449-
let fileNamePath = utilityFileSystem.getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
449+
let fileNamePath = utilityFileSystem.getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
450450

451451
await createDocument.createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "onlyoffice", creatorId: creator.identifier, templateId: templates.selectedTemplate.identifier, account: session.account)
452452
}

‎iOSClient/Menu/NCContextMenu.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,14 +483,14 @@ class NCContextMenu: NSObject {
483483
Task {
484484
let response = await NextcloudKit.shared.sendRequestAsync(account: metadata.account,
485485
fileId: metadata.fileId,
486-
filePath: utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId),
486+
filePath: utilityFileSystem.getRelativeFilePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId),
487487
url: item.url,
488488
method: item.method,
489489
params: item.params)
490490

491491
if response.error == .success {
492-
if response.error.errorCode == 200 {
493-
NCContentPresenter().showCustomMessage(message: "Works", type: .success)
492+
if let tooltip = response.uiResponse?.data?.tooltip {
493+
NCContentPresenter().showCustomMessage(message: tooltip, type: .success)
494494
} else {
495495
await MainActor.run {
496496
let viewer = DeclarativeUIViewer(

‎iOSClient/Networking/E2EE/NCNetworkingE2EERename.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class NCNetworkingE2EERename: NSObject {
4242

4343
// DB RENAME
4444
//
45-
let newFileNamePath = utilityFileSystem.getFileNamePath(fileNameNew, serverUrl: metadata.serverUrl, session: session)
45+
let newFileNamePath = utilityFileSystem.getRelativeFilePath(fileNameNew, serverUrl: metadata.serverUrl, session: session)
4646
await self.database.renameFileE2eEncryptionAsync(account: metadata.account, serverUrl: metadata.serverUrl, fileNameIdentifier: metadata.fileName, newFileName: fileNameNew, newFileNamePath: newFileNamePath)
4747

4848
// UPLOAD METADATA

‎iOSClient/Networking/NCNetworking+WebDAV.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ extension NCNetworking {
713713

714714
func setFavorite(metadata: tableMetadata) async -> NKError {
715715
let session = NCSession.Session(account: metadata.account, urlBase: metadata.urlBase, user: metadata.user, userId: metadata.userId)
716-
let fileName = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
716+
let fileName = utilityFileSystem.getRelativeFilePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
717717

718718
let results = await NextcloudKit.shared.setFavoriteAsync(fileName: fileName, favorite: metadata.favorite, account: metadata.account) { task in
719719
Task {

‎iOSClient/RichWorkspace/NCRichWorkspaceCommon.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class NCRichWorkspaceCommon: NSObject {
2222

2323
NCActivityIndicator.shared.start(backgroundView: viewController.view)
2424

25-
let fileNamePath = utilityFileSystem.getFileNamePath(NCGlobal.shared.fileNameRichWorkspace, serverUrl: serverUrl, session: session)
25+
let fileNamePath = utilityFileSystem.getRelativeFilePath(NCGlobal.shared.fileNameRichWorkspace, serverUrl: serverUrl, session: session)
2626
NextcloudKit.shared.textCreateFile(fileNamePath: fileNamePath, editorId: textCreators.editor, creatorId: textCreators.identifier, templateId: "", account: session.account) { task in
2727
Task {
2828
let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: session.account,
@@ -58,7 +58,7 @@ class NCRichWorkspaceCommon: NSObject {
5858
if metadata.url.isEmpty {
5959
NCActivityIndicator.shared.start(backgroundView: viewController.view)
6060

61-
let fileNamePath = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
61+
let fileNamePath = utilityFileSystem.getRelativeFilePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
6262
NextcloudKit.shared.textOpenFile(fileNamePath: fileNamePath, editor: "text", account: metadata.account) { task in
6363
Task {
6464
let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: metadata.account,

‎iOSClient/SceneDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
359359
}
360360
let serverUrl = controller.currentServerUrl()
361361
let fileName = await NCNetworking.shared.createFileName(fileNameBase: NSLocalizedString("_untitled_", comment: "") + "." + creator.ext, account: session.account, serverUrl: serverUrl)
362-
let fileNamePath = NCUtilityFileSystem().getFileNamePath(String(describing: fileName), serverUrl: serverUrl, session: session)
362+
let fileNamePath = NCUtilityFileSystem().getRelativeFilePath(String(describing: fileName), serverUrl: serverUrl, session: session)
363363

364364
await NCCreate().createDocument(controller: controller, fileNamePath: fileNamePath, fileName: String(describing: fileName), editorId: "text", creatorId: creator.identifier, templateId: "document", account: session.account)
365365
case self.global.actionVoiceMemo:

‎iOSClient/Select/NCSelect.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
145145
super.viewWillAppear(animated)
146146

147147
Task { @MainActor in
148-
let folderPath = utilityFileSystem.getFileNamePath("", serverUrl: serverUrl, session: session)
148+
let folderPath = utilityFileSystem.getRelativeFilePath("", serverUrl: serverUrl, session: session)
149149
let capabilities = await NKCapabilities.shared.getCapabilities(for: session.account)
150150

151151
if serverUrl.isEmpty || !FileNameValidator.checkFolderPath(folderPath, account: session.account, capabilities: capabilities) {

‎iOSClient/Share/NCShareNetworking.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class NCShareNetworking: NSObject {
6666
if showLoadingIndicator {
6767
NCActivityIndicator.shared.start(backgroundView: view)
6868
}
69-
let filenamePath = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
69+
let filenamePath = utilityFileSystem.getRelativeFilePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
7070
let parameter = NKShareParameter(path: filenamePath)
7171

7272
NextcloudKit.shared.readShares(parameters: parameter, account: metadata.account) { task in
@@ -116,7 +116,7 @@ class NCShareNetworking: NSObject {
116116

117117
func createShare(_ shareable: Shareable, downloadLimit: DownloadLimitViewModel) {
118118
NCActivityIndicator.shared.start(backgroundView: view)
119-
let filenamePath = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
119+
let filenamePath = utilityFileSystem.getRelativeFilePath(metadata.fileName, serverUrl: metadata.serverUrl, session: session)
120120
let capabilities = NCNetworking.shared.capabilities[self.metadata.account] ?? NKCapabilities.Capabilities()
121121

122122
NextcloudKit.shared.createShare(path: filenamePath,

0 commit comments

Comments
 (0)