From b529a101ae75bf9f20ae3b47d964e0a69b063754 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Mon, 15 Jan 2024 12:26:10 +0100 Subject: [PATCH] refactor file server --- MareSynchronosAPI/Routes/MareFiles.cs | 32 +++++++++------------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/MareSynchronosAPI/Routes/MareFiles.cs b/MareSynchronosAPI/Routes/MareFiles.cs index fef2a01..a4e5f5d 100644 --- a/MareSynchronosAPI/Routes/MareFiles.cs +++ b/MareSynchronosAPI/Routes/MareFiles.cs @@ -4,52 +4,42 @@ public class MareFiles { public const string Cache = "/cache"; public const string Cache_Get = "get"; + public const string Request = "/request"; - public const string Request_Cancel = "cancel"; - public const string Request_Check = "check"; - public const string Request_Enqueue = "enqueue"; - public const string Request_RequestFile = "file"; public const string ServerFiles = "/files"; - public const string ServerFiles_DeleteAll = "deleteAll"; - public const string ServerFiles_FilesSend = "filesSend"; - - public const string ServerFiles_Get = "get"; - public const string ServerFiles_GetSizes = "getFileSizes"; - public const string ServerFiles_Upload = "upload"; - public const string ServerFiles_UploadRaw = "uploadRaw"; - public const string ServerFiles_UploadMunged = "uploadMunged"; + public const string Distribution = "/dist"; + public const string Distribution_Get = "get"; + + public const string Main = "/main"; + public const string Main_SendReady = "sendReady"; + public static Uri CacheGetFullPath(Uri baseUri, Guid requestId) => new(baseUri, Cache + "/" + Cache_Get + "?requestId=" + requestId.ToString()); public static Uri RequestCancelFullPath(Uri baseUri, Guid guid) => new Uri(baseUri, Request + "/" + Request_Cancel + "?requestId=" + guid.ToString()); - public static Uri RequestCheckQueueFullPath(Uri baseUri, Guid guid) => new Uri(baseUri, Request + "/" + Request_Check + "?requestId=" + guid.ToString()); - public static Uri RequestEnqueueFullPath(Uri baseUri) => new(baseUri, Request + "/" + Request_Enqueue); - public static Uri RequestRequestFileFullPath(Uri baseUri, string hash) => new(baseUri, Request + "/" + Request_RequestFile + "?file=" + hash); public static Uri ServerFilesDeleteAllFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_DeleteAll); - public static Uri ServerFilesFilesSendFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_FilesSend); - - public static Uri ServerFilesGetFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_Get + "/" + hash); - public static Uri ServerFilesGetSizesFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_GetSizes); - public static Uri ServerFilesUploadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_Upload + "/" + hash); - public static Uri ServerFilesUploadRawFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadRaw + "/" + hash); public static Uri ServerFilesUploadMunged(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadMunged + "/" + hash); + + public static Uri DistributionGetFullPath(Uri baseUri, string hash) => new(baseUri, Distribution + "/" + Distribution_Get + "?file=" + hash); + + public static Uri MainSendReadyFullPath(Uri baseUri, string uid, Guid request) => new(baseUri, Main + "/" + Main_SendReady + "/" + "?uid=" + uid + "&requestId=" + request.ToString()); } \ No newline at end of file