From fc50ebb3d56f54d1133bdea15c831c95f7ffdf75 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 2 Oct 2023 15:38:58 +0200 Subject: [PATCH] re-organize Nextcloud project structure --- .../Apps/{ => FileRetention}/FilesRetentionClient.cs | 5 ++--- .../Apps/FileRetention/Model}/RetentionRule.cs | 5 ++--- .../Apps/FileRetention/Model}/RetentionRuleInfo.cs | 4 ++-- .../Apps/FileRetention/Model}/RetentionTimeAfter.cs | 2 +- .../Apps/FileRetention/Model}/RetentionTimeUnit.cs | 2 +- .../Apps/FileRetention/Ocs}/OcsDataRetentionRule.cs | 3 ++- .../FileRetention/Ocs}/OcsResponseDataEntryRetention.cs | 3 ++- .../Apps/FileRetention/Ocs}/OcsResponseRetention.cs | 3 ++- .../Apps/FileRetention}/OcsApiFilesRetention.cs | 6 +++--- .../Client/{ => Cloud}/CloudClient.cs | 4 ++-- .../Cloud/Model}/UserBackendCapabilities.cs | 2 +- .../{Model/Cloud => Client/Cloud/Model}/UserInfo.cs | 4 ++-- .../{Model/Cloud => Client/Cloud/Model}/UserQuota.cs | 2 +- .../Cloud => Client/Cloud/Ocs}/OcsResponseDataUser.cs | 3 ++- .../Cloud => Client/Cloud/Ocs}/OcsResponseUser.cs | 3 ++- .../{OCS/APIs => Client/Cloud}/OcsApiCloud.cs | 5 +++-- .../{OCS/APIs => Client/Core}/OcsApiCore.cs | 3 ++- .../LoginFlowV2/Ocs}/OcsResponseLoginFlowV2.cs | 2 +- .../LoginFlowV2/Ocs}/OcsResponseLoginFlowV2Credentials.cs | 2 +- .../{OCS/APIs => Client/LoginFlowV2}/OcsApiLoginFlowV2.cs | 5 +++-- Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs | 3 +-- .../NextcloudClient.cs | 7 +++---- .../{Model => }/NextcloudLogin.cs | 4 ++-- Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs | 5 +++-- .../OCS/{APIs => }/OcsApiBase.cs | 2 +- .../OCS/{Data => }/OcsData.cs | 2 +- .../Pilz.Networking.CloudProviders.Nextcloud.csproj | 2 +- 27 files changed, 49 insertions(+), 44 deletions(-) rename Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/{ => FileRetention}/FilesRetentionClient.cs (85%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model/Apps/FilesRetention => Client/Apps/FileRetention/Model}/RetentionRule.cs (77%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model/Apps/FilesRetention => Client/Apps/FileRetention/Model}/RetentionRuleInfo.cs (86%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model/Apps/FilesRetention => Client/Apps/FileRetention/Model}/RetentionTimeAfter.cs (71%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model/Apps/FilesRetention => Client/Apps/FileRetention/Model}/RetentionTimeUnit.cs (73%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/Data/Apps/FileRetention => Client/Apps/FileRetention/Ocs}/OcsDataRetentionRule.cs (79%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/Responses/Apps/FilesRetention => Client/Apps/FileRetention/Ocs}/OcsResponseDataEntryRetention.cs (82%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/Responses/Apps/FilesRetention => Client/Apps/FileRetention/Ocs}/OcsResponseRetention.cs (64%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/APIs/Apps => Client/Apps/FileRetention}/OcsApiFilesRetention.cs (85%) rename Pilz.Networking.CloudProviders.Nextcloud/Client/{ => Cloud}/CloudClient.cs (85%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model/Cloud => Client/Cloud/Model}/UserBackendCapabilities.cs (87%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model/Cloud => Client/Cloud/Model}/UserInfo.cs (96%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model/Cloud => Client/Cloud/Model}/UserQuota.cs (92%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/Responses/Cloud => Client/Cloud/Ocs}/OcsResponseDataUser.cs (94%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/Responses/Cloud => Client/Cloud/Ocs}/OcsResponseUser.cs (63%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/APIs => Client/Cloud}/OcsApiCloud.cs (75%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/APIs => Client/Core}/OcsApiCore.cs (83%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/Responses/LoginFlowV2 => Client/LoginFlowV2/Ocs}/OcsResponseLoginFlowV2.cs (92%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/Responses/LoginFlowV2 => Client/LoginFlowV2/Ocs}/OcsResponseLoginFlowV2Credentials.cs (90%) rename Pilz.Networking.CloudProviders.Nextcloud/{OCS/APIs => Client/LoginFlowV2}/OcsApiLoginFlowV2.cs (83%) rename Pilz.Networking.CloudProviders.Nextcloud/{Model => }/NextcloudLogin.cs (87%) rename Pilz.Networking.CloudProviders.Nextcloud/OCS/{APIs => }/OcsApiBase.cs (84%) rename Pilz.Networking.CloudProviders.Nextcloud/OCS/{Data => }/OcsData.cs (72%) diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FilesRetentionClient.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs similarity index 85% rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FilesRetentionClient.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs index ff9eb8c..ae5bb87 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FilesRetentionClient.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs @@ -1,12 +1,11 @@ -using Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention; -using Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs.Apps; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention { public class FilesRetentionClient : ClientBase { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRule.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs similarity index 77% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRule.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs index 73c81a5..00aa961 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRule.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs @@ -1,12 +1,11 @@ -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Data.Apps.FileRetention; -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Apps.FilesRetention; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model { public class RetentionRule : RetentionRuleInfo { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRuleInfo.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs similarity index 86% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRuleInfo.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs index d77aa59..630f2bb 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRuleInfo.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs @@ -1,11 +1,11 @@ -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Data.Apps.FileRetention; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model { public class RetentionRuleInfo { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionTimeAfter.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs similarity index 71% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionTimeAfter.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs index 09a02eb..a20d65f 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionTimeAfter.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model { public enum RetentionTimeAfter { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionTimeUnit.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs similarity index 73% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionTimeUnit.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs index 95d381a..7ebcf9b 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionTimeUnit.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model { public enum RetentionTimeUnit { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Data/Apps/FileRetention/OcsDataRetentionRule.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs similarity index 79% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Data/Apps/FileRetention/OcsDataRetentionRule.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs index 7a6a2fc..6e96ee7 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Data/Apps/FileRetention/OcsDataRetentionRule.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs @@ -1,11 +1,12 @@ using Newtonsoft.Json; +using Pilz.Networking.CloudProviders.Nextcloud.OCS; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Data.Apps.FileRetention +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs { public class OcsDataRetentionRule : OcsData { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Apps/FilesRetention/OcsResponseDataEntryRetention.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs similarity index 82% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Apps/FilesRetention/OcsResponseDataEntryRetention.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs index 0ea024d..ace4e4b 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Apps/FilesRetention/OcsResponseDataEntryRetention.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs @@ -1,11 +1,12 @@ using Newtonsoft.Json; +using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Apps.FilesRetention +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs { public class OcsResponseDataEntryRetention : OcsResponseDataEntry { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Apps/FilesRetention/OcsResponseRetention.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs similarity index 64% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Apps/FilesRetention/OcsResponseRetention.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs index ad65dc7..bbc97ba 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Apps/FilesRetention/OcsResponseRetention.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs @@ -1,11 +1,12 @@ using Newtonsoft.Json; +using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Apps.FilesRetention +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs { public class OcsResponseRetention : OcsResponse> { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/Apps/OcsApiFilesRetention.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs similarity index 85% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/Apps/OcsApiFilesRetention.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs index 4a50eb3..3af58af 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/Apps/OcsApiFilesRetention.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs @@ -1,6 +1,6 @@ -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Data.Apps.FileRetention; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs; +using Pilz.Networking.CloudProviders.Nextcloud.OCS; using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses; -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Apps.FilesRetention; using System; using System.Collections.Generic; using System.Data; @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs.Apps +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention { public class OcsApiFilesRetention : OcsApiBase { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/CloudClient.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs similarity index 85% rename from Pilz.Networking.CloudProviders.Nextcloud/Client/CloudClient.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs index cc35a5b..bd61ecf 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Client/CloudClient.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs @@ -1,11 +1,11 @@ -using Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Client +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud { public class CloudClient : ClientBase { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserBackendCapabilities.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs similarity index 87% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserBackendCapabilities.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs index e0dc646..54cf4d0 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserBackendCapabilities.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model { public class UserBackendCapabilities { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserInfo.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs similarity index 96% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserInfo.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs index d003a5c..fecf7f9 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserInfo.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs @@ -1,11 +1,11 @@ -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Cloud; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model { public class UserInfo { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserQuota.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs similarity index 92% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserQuota.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs index fb711ea..930e4d5 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserQuota.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model { public class UserQuota { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseDataUser.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs similarity index 94% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseDataUser.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs index 331be95..2aec6e4 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseDataUser.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs @@ -1,11 +1,12 @@ using Newtonsoft.Json; +using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Cloud +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs { public class OcsResponseDataUser : OcsResponseData { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseUser.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs similarity index 63% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseUser.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs index f3f3e74..3aeb534 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseUser.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs @@ -1,11 +1,12 @@ using Newtonsoft.Json; +using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Cloud +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs { public class OcsResponseUser : OcsResponse { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCloud.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs similarity index 75% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCloud.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs index d74fcd8..3292091 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCloud.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs @@ -1,11 +1,12 @@ -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Cloud; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs; +using Pilz.Networking.CloudProviders.Nextcloud.OCS; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud { public class OcsApiCloud : OcsApiBase { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCore.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs similarity index 83% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCore.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs index 2ed8e33..60770e7 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCore.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Pilz.Networking.CloudProviders.Nextcloud.OCS; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Core { public class OcsApiCore : OcsApiBase { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/LoginFlowV2/OcsResponseLoginFlowV2.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs similarity index 92% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/LoginFlowV2/OcsResponseLoginFlowV2.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs index 11c45ff..9f8f39b 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/LoginFlowV2/OcsResponseLoginFlowV2.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.LoginFlowV2 +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs { public class OcsResponseLoginFlowV2 { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/LoginFlowV2/OcsResponseLoginFlowV2Credentials.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs similarity index 90% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/LoginFlowV2/OcsResponseLoginFlowV2Credentials.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs index 121bf8c..ae019cf 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/LoginFlowV2/OcsResponseLoginFlowV2Credentials.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.LoginFlowV2 +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs { public class OcsResponseLoginFlowV2Credentials { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiLoginFlowV2.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs similarity index 83% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiLoginFlowV2.cs rename to Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs index 62d27ee..7ca9abd 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiLoginFlowV2.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs @@ -1,11 +1,12 @@ -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.LoginFlowV2; +using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs; +using Pilz.Networking.CloudProviders.Nextcloud.OCS; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs +namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2 { public class OcsApiLoginFlowV2 : OcsApiBase { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs b/Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs index 24c928c..b0e61c8 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs @@ -1,5 +1,4 @@ -using Pilz.Networking.CloudProviders.Nextcloud.Model; -using Pilz.Networking.CloudProviders.Nextcloud.OCS; +using Pilz.Networking.CloudProviders.Nextcloud.OCS; using System; using System.Collections.Generic; using System.Linq; diff --git a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs b/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs index a0be030..a440ae4 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs @@ -5,12 +5,11 @@ using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; -using Pilz.Networking.CloudProviders.Nextcloud; using Pilz.Networking.CloudProviders.Nextcloud.Client; -using Pilz.Networking.CloudProviders.Nextcloud.Model; -using Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model; +using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs; using Pilz.Networking.CloudProviders.Nextcloud.OCS; -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.LoginFlowV2; namespace Pilz.Networking.CloudProviders.Nextcloud { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/NextcloudLogin.cs b/Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs similarity index 87% rename from Pilz.Networking.CloudProviders.Nextcloud/Model/NextcloudLogin.cs rename to Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs index c30ee61..8e1a8b8 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Model/NextcloudLogin.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs @@ -1,12 +1,12 @@ using Newtonsoft.Json; -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.LoginFlowV2; +using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.Model +namespace Pilz.Networking.CloudProviders.Nextcloud { public class NextcloudLogin { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs index 9007d46..ba9babe 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs @@ -7,11 +7,12 @@ using System.Net.Http.Headers; using Newtonsoft.Json; using System.Diagnostics; using System.Net; -using Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs; using System.Net.Sockets; -using Pilz.Networking.CloudProviders.Nextcloud.OCS.Data; using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses; using System.Xml.Linq; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud; +using Pilz.Networking.CloudProviders.Nextcloud.Client.Core; +using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2; namespace Pilz.Networking.CloudProviders.Nextcloud.OCS { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiBase.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs similarity index 84% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiBase.cs rename to Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs index d1d9952..92dcdaf 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiBase.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs +namespace Pilz.Networking.CloudProviders.Nextcloud.OCS { public abstract class OcsApiBase { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Data/OcsData.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs similarity index 72% rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Data/OcsData.cs rename to Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs index 749615c..9c75fd0 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Data/OcsData.cs +++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Data +namespace Pilz.Networking.CloudProviders.Nextcloud.OCS { public class OcsData { diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj b/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj index a0a8ce4..8d2123e 100644 --- a/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj +++ b/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj @@ -9,7 +9,7 @@ True 1.yyyy.Mdd.Hmm - 1.2023.1002.1520 + 1.2023.1002.1538