Improved widget!

Signed-off-by: marinofaggiana <marino.faggiana@nextcloud.com>

Widget/Dashboard/DashboardData.swift

@@ -22,7 +22,7 @@
 //
 
 import WidgetKit
-import NextcloudKit
+import NCCommunication
 
 struct DashboardData: Identifiable, Codable, Hashable {
     var id: Int

Widget/Nextcloud/NextcloudData.swift

@@ -22,10 +22,10 @@
 //
 
 import WidgetKit
-import NextcloudKit
+import NCCommunication
 
 struct NextcloudData: Identifiable, Codable, Hashable {
-    var id: Int
+    var id: String
     var image: String
     var title: String
     var subTitle: String
@@ -40,10 +40,10 @@ struct NextcloudDataEntry: TimelineEntry {
 }
 
 let nextcloudDatasTest: [NextcloudData] = [
-    .init(id: 0, image: "nextcloud", title: "title 1", subTitle: "subTitle - description 1", url: URL(string: "https://nextcloud.com/")!),
-    .init(id: 1, image: "nextcloud", title: "title 2", subTitle: "subTitle - description 2", url: URL(string: "https://nextcloud.com/")!),
-    .init(id: 2, image: "nextcloud", title: "title 3", subTitle: "subTitle - description 3", url: URL(string: "https://nextcloud.com/")!),
-    .init(id: 3, image: "nextcloud", title: "title 4", subTitle: "subTitle - description 4", url: URL(string: "https://nextcloud.com/")!)
+    .init(id: "0", image: "nextcloud", title: "title 1", subTitle: "subTitle - description 1", url: URL(string: "https://nextcloud.com/")!),
+    .init(id: "1", image: "nextcloud", title: "title 2", subTitle: "subTitle - description 2", url: URL(string: "https://nextcloud.com/")!),
+    .init(id: "2", image: "nextcloud", title: "title 3", subTitle: "subTitle - description 3", url: URL(string: "https://nextcloud.com/")!),
+    .init(id: "3", image: "nextcloud", title: "title 4", subTitle: "subTitle - description 4", url: URL(string: "https://nextcloud.com/")!)
 ]
 
 func readNextcloudData(completion: @escaping (_ NextcloudDatas: [NextcloudData], _ isPlaceholder: Bool, _ footerText: String) -> Void) {
@@ -52,24 +52,118 @@ func readNextcloudData(completion: @escaping (_ NextcloudDatas: [NextcloudData],
         return completion(nextcloudDatasTest, true, NSLocalizedString("_no_active_account_", value: "No account found", comment: ""))
     }
 
+    // NETWORKING
+    NCCommunicationCommon.shared.setup(
+        account: account.account,
+        user: account.user,
+        userId: account.userId,
+        password: CCUtility.getPassword(account.account),
+        urlBase: account.urlBase,
+        userAgent: CCUtility.getUserAgent(),
+        webDav: NCUtilityFileSystem.shared.getWebDAV(account: account.account),
+        nextcloudVersion: 0,
+        delegate: NCNetworking.shared)
+
+    let requestBodyRecent =
+    """
+    <?xml version=\"1.0\"?>
+    <d:searchrequest xmlns:d=\"DAV:\" xmlns:oc=\"http://owncloud.org/ns\" xmlns:nc=\"http://nextcloud.org/ns\">
+    <d:basicsearch>
+        <d:select>
+            <d:prop>
+                <d:displayname/>
+                <d:getcontenttype/>
+                <d:resourcetype/>
+                <d:getcontentlength/>
+                <d:getlastmodified/>
+                <d:getetag/>
+                <d:quota-used-bytes/>
+                <d:quota-available-bytes/>
+                <permissions xmlns=\"http://owncloud.org/ns\"/>
+                <id xmlns=\"http://owncloud.org/ns\"/>
+                <fileid xmlns=\"http://owncloud.org/ns\"/>
+                <size xmlns=\"http://owncloud.org/ns\"/>
+                <favorite xmlns=\"http://owncloud.org/ns\"/>
+                <creation_time xmlns=\"http://nextcloud.org/ns\"/>
+                <upload_time xmlns=\"http://nextcloud.org/ns\"/>
+                <is-encrypted xmlns=\"http://nextcloud.org/ns\"/>
+                <mount-type xmlns=\"http://nextcloud.org/ns\"/>
+                <owner-id xmlns=\"http://owncloud.org/ns\"/>
+                <owner-display-name xmlns=\"http://owncloud.org/ns\"/>
+                <comments-unread xmlns=\"http://owncloud.org/ns\"/>
+                <has-preview xmlns=\"http://nextcloud.org/ns\"/>
+                <trashbin-filename xmlns=\"http://nextcloud.org/ns\"/>
+                <trashbin-original-location xmlns=\"http://nextcloud.org/ns\"/>
+                <trashbin-deletion-time xmlns=\"http://nextcloud.org/ns\"/>
+            </d:prop>
+        </d:select>
+    <d:from>
+        <d:scope>
+            <d:href>%@</d:href>
+            <d:depth>infinity</d:depth>
+        </d:scope>
+    </d:from>
+    <d:where>
+        <d:lt>
+            <d:prop>
+                <d:getlastmodified/>
+            </d:prop>
+            <d:literal>%@</d:literal>
+        </d:lt>
+    </d:where>
+    <d:orderby>
+        <d:order>
+            <d:prop>
+                <d:getlastmodified/>
+            </d:prop>
+            <d:descending/>
+        </d:order>
+    </d:orderby>
+    <d:limit>
+        <d:nresults>4</d:nresults>
+    </d:limit>
+    </d:basicsearch>
+    </d:searchrequest>
+    """
+
+    let dateFormatter = DateFormatter()
+    dateFormatter.locale = Locale(identifier: "en_US_POSIX")
+    dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+    let lessDateString = dateFormatter.string(from: Date())
+    let requestBody = String(format: requestBodyRecent, "/files/" + account.userId, lessDateString)
+
     // LOG
     let levelLog = CCUtility.getLogLevel()
     let isSimulatorOrTestFlight = NCUtility.shared.isSimulatorOrTestFlight()
     let versionNextcloudiOS = String(format: NCBrandOptions.shared.textCopyrightNextcloudiOS, NCUtility.shared.getVersionApp())
 
-    NKCommon.shared.levelLog = levelLog
+    NCCommunicationCommon.shared.levelLog = levelLog
     if let pathDirectoryGroup = CCUtility.getDirectoryGroup()?.path {
-        NKCommon.shared.pathLog = pathDirectoryGroup
+        NCCommunicationCommon.shared.pathLog = pathDirectoryGroup
     }
     if isSimulatorOrTestFlight {
-        NKCommon.shared.writeLog("Start \(NCBrandOptions.shared.brand) widget session with level \(levelLog) " + versionNextcloudiOS + " (Simulator / TestFlight)")
+        NCCommunicationCommon.shared.writeLog("Start \(NCBrandOptions.shared.brand) widget session with level \(levelLog) " + versionNextcloudiOS + " (Simulator / TestFlight)")
     } else {
-        NKCommon.shared.writeLog("Start \(NCBrandOptions.shared.brand) widget session with level \(levelLog) " + versionNextcloudiOS)
+        NCCommunicationCommon.shared.writeLog("Start \(NCBrandOptions.shared.brand) widget session with level \(levelLog) " + versionNextcloudiOS)
     }
-    NKCommon.shared.writeLog("Start \(NCBrandOptions.shared.brand) widget [Auto upload]")
+    NCCommunicationCommon.shared.writeLog("Start \(NCBrandOptions.shared.brand) widget [Auto upload]")
 
-    NCAutoUpload.shared.initAutoUpload(viewController: nil) { items in
-        completion(nextcloudDatasTest, false, "Auto upoload: \(items), \(Date().formatted())")
-        NKCommon.shared.writeLog("Completition \(NCBrandOptions.shared.brand) widget [Auto upload]")
-    }
+    //NCAutoUpload.shared.initAutoUpload(viewController: nil) { items in
+    NCCommunicationCommon.shared.writeLog("Completition \(NCBrandOptions.shared.brand) widget [Auto upload]")
+        NCCommunication.shared.searchBodyRequest(serverUrl: account.urlBase, requestBody: requestBody, showHiddenFiles: CCUtility.getShowHiddenFiles()) { _, files, errorCode, errorDescription in
+            var nextcloudDatas: [NextcloudData] = []
+            for file in files {
+                let subTitle = CCUtility.dateDiff(file.date as Date) + " · " + CCUtility.transformedSize(file.size)
+                let nextcloudData = NextcloudData.init(id: file.ocId, image: "", title: file.fileName, subTitle: "", url: URL(string: "https://nextcloud.com/")!)
+                nextcloudDatas.append(nextcloudData)
+            }
+            if nextcloudDatas.isEmpty {
+                completion(nextcloudDatasTest, true, "Auto upoload: \(0), \(Date().formatted())")
+            } else if errorCode != 0 {
+                completion(nextcloudDatasTest, true, errorDescription)
+            } else {
+                completion(nextcloudDatas, false, "Auto upoload: \(items), \(Date().formatted())")
+            }
+        }
+    //}
 }

Widget/Nextcloud/NextcloudWidgetView.swift

@@ -34,7 +34,7 @@ struct NextcloudWidgetView: View {
                     .scaledToFit()
                     .frame(width: 10, height: 10)
                     .cornerRadius(3)
-                Text(NCBrandOptions.shared.brand + "")
+                Text(NCBrandOptions.shared.brand + "c")
                     .font(.system(size: 11))
                     .textCase(.uppercase)
             }