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

Jump to bottom

Report client status #2637

Merged
merged 10 commits into from
Oct 17, 2023
Merged

Report client status #2637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cf52820
sendClientDiagnosticsRemoteOperation
marinofaggiana Oct 12, 2023
4c6fa22
sendClientDiagnosticsRemoteOperation
marinofaggiana Oct 12, 2023
4d3e448
sendClientDiagnosticsRemoteOperation
marinofaggiana Oct 12, 2023
aeeb5ef
sendClientDiagnosticsRemoteOperation
marinofaggiana Oct 13, 2023
7c8f4d1
sendClientDiagnosticsRemoteOperation
marinofaggiana Oct 13, 2023
9742d3e
sendClientDiagnosticsRemoteOperation
marinofaggiana Oct 13, 2023
5ef66f7
change metadata DB
marinofaggiana Oct 16, 2023
872dade
change metadata DB
marinofaggiana Oct 16, 2023
713a927
test
marinofaggiana Oct 16, 2023
d977504
sendClientDiagnosticsRemoteOperation
marinofaggiana Oct 16, 2023
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
2 changes: 1 addition & 1 deletion Brand/Database.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ import Foundation
// Database Realm
//
let databaseName = "nextcloud.realm"
let databaseSchemaVersion: UInt64 = 319
let databaseSchemaVersion: UInt64 = 320
2 changes: 1 addition & 1 deletion Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5041,7 +5041,7 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/nextcloud/NextcloudKit";
requirement = {
branch = develop;
branch = "report-client-status";
kind = branch;
};
};
Expand Down
57 changes: 50 additions & 7 deletions iOSClient/Data/NCManageDatabase+Metadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
@objc dynamic var longitude: Double = 0
@objc dynamic var height: Int = 0
@objc dynamic var width: Int = 0
@objc dynamic var errorCode: Int = 0
@objc dynamic var errorCodeCounter: Int = 0
@objc dynamic var errorCodeDate: Date?

override static func primaryKey() -> String {
return "ocId"
Expand Down Expand Up @@ -390,7 +393,7 @@

for index in metadatas.indices {
let metadata = metadatas[index]
if index < metadatas.count - 1,

Check warning on line 396 in iOSClient/Data/NCManageDatabase+Metadata.swift

View workflow job for this annotation

GitHub Actions / Lint 

Control Statement Violation: `if`, `for`, `guard`, `switch`, `while`, and `catch` statements shouldn't unnecessarily wrap their conditionals or arguments in parentheses (control_statement)
metadata.fileNoExtension == metadatas[index + 1].fileNoExtension,
((metadata.classFile == NKCommon.TypeClassFile.image.rawValue && metadatas[index + 1].classFile == NKCommon.TypeClassFile.video.rawValue) || (metadata.classFile == NKCommon.TypeClassFile.video.rawValue && metadatas[index + 1].classFile == NKCommon.TypeClassFile.image.rawValue)) {
metadata.livePhoto = true
Expand Down Expand Up @@ -626,7 +629,7 @@
return ([], [], [])
}

func setMetadataSession(ocId: String, newFileName: String? = nil, session: String? = nil, sessionError: String? = nil, sessionSelector: String? = nil, sessionTaskIdentifier: Int? = nil, status: Int? = nil, etag: String? = nil) {
func setMetadataSession(ocId: String, newFileName: String? = nil, session: String?, sessionError: String?, sessionSelector: String?, sessionTaskIdentifier: Int?, status: Int?, etag: String? = nil, errorCode: Int?) {

do {
let realm = try Realm()
Expand All @@ -636,24 +639,33 @@
result.fileName = newFileName
result.fileNameView = newFileName
}
if let session = session {
if let session {
result.session = session
}
if let sessionError = sessionError {
if let sessionError {
result.sessionError = sessionError
}
if let sessionSelector = sessionSelector {
if let sessionSelector {
result.sessionSelector = sessionSelector
}
if let sessionTaskIdentifier = sessionTaskIdentifier {
if let sessionTaskIdentifier {
result.sessionTaskIdentifier = sessionTaskIdentifier
}
if let status = status {
if let status {
result.status = status
}
if let etag = etag {
if let etag {
result.etag = etag
}
if let errorCode {
result.errorCode = errorCode
if errorCode == 0 {
result.errorCodeCounter = 0
} else {
result.errorCodeCounter += 1
result.errorCodeDate = Date()
}
}
}
}
} catch let error {
Expand Down Expand Up @@ -1207,4 +1219,35 @@

return metadatas
}

func getMetadatasInError(account: String) -> Results<tableMetadata>? {

do {
let realm = try Realm()
let results = realm.objects(tableMetadata.self).filter("account == %@ AND errorCodeCounter > 1", account)
return results
} catch let error as NSError {
NextcloudKit.shared.nkCommonInstance.writeLog("Could not access database: \(error)")
}

return nil
}

func clearErrorCodeMetadatas(metadatas: Results<tableMetadata>?) {

guard let metadatas else { return }

do {
let realm = try Realm()
try realm.write {
for metadata in metadatas {
metadata.errorCode = 0
metadata.errorCodeCounter = 0
metadata.errorCodeDate = nil
}
}
} catch let error as NSError {
NextcloudKit.shared.nkCommonInstance.writeLog("Could not access database: \(error)")
}
}
}
2 changes: 1 addition & 1 deletion iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class NCNetworkingE2EEUpload: NSObject {

} else {

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: resultsSendFile.error.errorDescription, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: resultsSendFile.error.errorDescription, sessionSelector: nil, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError, errorCode: resultsSendFile.error.errorCode)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": resultsSendFile.error])
}

Expand Down
24 changes: 12 additions & 12 deletions iOSClient/Networking/NCNetworking.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,15 @@ class NCNetworking: NSObject, NKCommonDelegate {
NCManageDatabase.shared.addMetadata(tableMetadata.init(value: metadata))
}

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload, sessionError: "", sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusInDownload)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload, sessionError: "", sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusInDownload, errorCode: nil)

NextcloudKit.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue, requestHandler: { request in

requestHandler(request)

self.downloadRequest[fileNameLocalPath] = request

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusDownloading)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: "", sessionSelector: nil, sessionTaskIdentifier: nil, status: NCGlobal.shared.metadataStatusDownloading, errorCode: nil)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDownloadStartFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account])

}, taskHandler: { _ in
Expand All @@ -329,12 +329,12 @@ class NCNetworking: NSObject, NKCommonDelegate {

if afError?.isExplicitlyCancelledError ?? false {

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal, errorCode: 0)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDownloadCancelFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account])

} else if error == .success {

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal, etag: etag)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal, etag: etag, errorCode: 0)
NCManageDatabase.shared.addLocalFile(metadata: metadata)
#if !EXTENSION
if let result = NCManageDatabase.shared.getE2eEncryption(predicate: NSPredicate(format: "fileNameIdentifier == %@ AND serverUrl == %@", metadata.fileName, metadata.serverUrl)) {
Expand All @@ -345,7 +345,7 @@ class NCNetworking: NSObject, NKCommonDelegate {

} else {

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: error.errorDescription, sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusDownloadError)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: error.errorDescription, sessionSelector: selector, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusDownloadError, errorCode: error.errorCode)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDownloadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "selector": selector, "error": error])
}

Expand Down Expand Up @@ -406,7 +406,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
}, taskHandler: { task in

uploadTask = task
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, sessionError: "", sessionTaskIdentifier: task.taskIdentifier, status: NCGlobal.shared.metadataStatusUploading)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: "", sessionSelector: nil, sessionTaskIdentifier: task.taskIdentifier, status: NCGlobal.shared.metadataStatusUploading, errorCode: nil)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadStartFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "sessionSelector": metadata.sessionSelector])
start()

Expand Down Expand Up @@ -475,7 +475,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
} taskHandler: { task in

uploadTask = task
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, sessionError: "", sessionTaskIdentifier: task.taskIdentifier, status: NCGlobal.shared.metadataStatusUploading)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: "", sessionSelector: nil, sessionTaskIdentifier: task.taskIdentifier, status: NCGlobal.shared.metadataStatusUploading, errorCode: nil)

} progressHandler: { totalBytesExpected, totalBytes, fractionCompleted in

Expand Down Expand Up @@ -568,7 +568,7 @@ class NCNetworking: NSObject, NKCommonDelegate {

NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Upload file \(metadata.fileNameView) with task with taskIdentifier \(task.taskIdentifier)")

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, sessionError: "", sessionTaskIdentifier: task.taskIdentifier, status: NCGlobal.shared.metadataStatusUploading)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: "", sessionSelector: nil, sessionTaskIdentifier: task.taskIdentifier, status: NCGlobal.shared.metadataStatusUploading, errorCode: nil)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadStartFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "sessionSelector": metadata.sessionSelector])
completion(NKError())

Expand Down Expand Up @@ -646,7 +646,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
let atpath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId) + "/" + metadata.fileName
let toPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId) + "/" + newFileName
NCUtilityFileSystem.shared.moveFile(atPath: atpath, toPath: toPath)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, newFileName: newFileName, session: nil, sessionError: "", sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusWaitUpload)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, newFileName: newFileName, session: nil, sessionError: "", sessionSelector: nil, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusWaitUpload, errorCode: error.errorCode)
}))
alertController.addAction(UIAlertAction(title: NSLocalizedString("_discard_changes_", comment: ""), style: .destructive, handler: { _ in
CCUtility.removeFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId))
Expand All @@ -663,7 +663,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
#endif
} else {

NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: error.errorDescription, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: error.errorDescription, sessionSelector: nil, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError, errorCode: error.errorCode)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": error])
}
}
Expand Down Expand Up @@ -759,7 +759,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
// DOWNLOAD
for metadata in metadatasDownload {
CCUtility.removeFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId))
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: "", sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: "", sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal, errorCode: 0)
}
// UPLOAD
for metadata in metadatasUpload {
Expand Down Expand Up @@ -806,7 +806,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
if let request = downloadRequest[fileNameLocalPath] {
request.cancel()
} else if let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) {
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: "", sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal)
NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: "", sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusNormal, errorCode: 0)
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDownloadCancelFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account])
}
return
Expand Down
Loading
Loading