From 6cda5751dfcf6310d6ac8042837dae9416aa7d12 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 10 Nov 2024 00:50:47 +0800
Subject: [PATCH] :bug: Still reading the abandoned temporary dest config

---
 .idea/workspace.xml               | 61 ++++++++++++++-----------------
 pkg/internal/services/analyzer.go |  4 +-
 pkg/internal/services/merger.go   |  2 +-
 pkg/internal/services/recycler.go |  4 +-
 pkg/internal/services/uploader.go | 10 ++---
 settings.toml                     |  2 +-
 6 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5dba16c..75722d6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,9 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="18dd0d68-b4b8-40db-9734-9119b5c848bd" name="更改" comment=":bug: Fix hash bug">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/bac83d8a-c619-4680-a07f-6674b93fbfea.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/bac83d8a-c619-4680-a07f-6674b93fbfea.xml" afterDir="false" />
+    <list default="true" id="18dd0d68-b4b8-40db-9734-9119b5c848bd" name="更改" comment=":bug: Provide a way to bypass nexus and serving content to prevent nexus reverse proxy issue">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/models/attachments.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/attachments.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/models/destination.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/destination.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/attachments_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/attachments_api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/services/analyzer.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/analyzer.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/services/merger.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/merger.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pkg/internal/services/uploader.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/uploader.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/settings.toml" beforeDir="false" afterPath="$PROJECT_DIR$/settings.toml" afterDir="false" />
     </list>
@@ -48,33 +43,33 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "DefaultGoTemplateProperty": "Go File",
-    "Go Build.Backend.executor": "Debug",
-    "Go 构建.Backend.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.go.formatter.settings.were.checked": "true",
-    "RunOnceActivity.go.migrated.go.modules.settings": "true",
-    "RunOnceActivity.go.modules.automatic.dependencies.download": "true",
-    "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
-    "git-widget-placeholder": "master",
-    "go.import.settings.migrated": "true",
-    "go.sdk.automatically.set": "true",
-    "last_opened_file_path": "/Users/littlesheep/Documents/Projects/Hypernet/Paperclip",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "run.code.analysis.last.selected.profile": "pProject Default",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;DefaultGoTemplateProperty&quot;: &quot;Go File&quot;,
+    &quot;Go Build.Backend.executor&quot;: &quot;Debug&quot;,
+    &quot;Go 构建.Backend.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.modules.automatic.dependencies.download&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
+    &quot;go.sdk.automatically.set&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/littlesheep/Documents/Projects/Hypernet/Paperclip&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "postgresql"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;postgresql&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/pkg/internal/gap" />
@@ -125,7 +120,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":zap: Fix the RandString method cause the lag" />
     <MESSAGE value=":bug: Fix mark clean required issue" />
     <MESSAGE value=":sparkles: Support use rid to get file" />
     <MESSAGE value=":boom: Replace attachment id by rid when fetching" />
@@ -150,7 +144,8 @@
     <MESSAGE value=":wastebasket: Remove account" />
     <MESSAGE value=":bug: Bug fixes" />
     <MESSAGE value=":bug: Fix hash bug" />
-    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix hash bug" />
+    <MESSAGE value=":bug: Provide a way to bypass nexus and serving content to prevent nexus reverse proxy issue" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Provide a way to bypass nexus and serving content to prevent nexus reverse proxy issue" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/internal/services/analyzer.go b/pkg/internal/services/analyzer.go
index 4d98c77..7a58350 100644
--- a/pkg/internal/services/analyzer.go
+++ b/pkg/internal/services/analyzer.go
@@ -116,7 +116,7 @@ func AnalyzeAttachment(file models.Attachment) error {
 
 	// Do analyze jobs
 	if !file.IsAnalyzed || len(file.HashCode) == 0 {
-		destMap := viper.GetStringMap("destinations.temporary")
+		destMap := viper.GetStringMap("destinations.0")
 
 		var dest models.LocalDestination
 		rawDest, _ := jsoniter.Marshal(destMap)
@@ -259,7 +259,7 @@ func AnalyzeAttachment(file models.Attachment) error {
 func HashAttachment(file models.Attachment) (hash string, err error) {
 	const chunkSize = 32 * 1024
 
-	destMap := viper.GetStringMapString("destinations.temporary")
+	destMap := viper.GetStringMapString("destinations.0")
 	destPath := filepath.Join(destMap["path"], file.Uuid)
 
 	// Check if the file exists
diff --git a/pkg/internal/services/merger.go b/pkg/internal/services/merger.go
index acd2445..9f1b177 100644
--- a/pkg/internal/services/merger.go
+++ b/pkg/internal/services/merger.go
@@ -13,7 +13,7 @@ import (
 
 func MergeFileChunks(meta models.Attachment, arrange []string) (models.Attachment, error) {
 	// Fetch destination from config
-	destMap := viper.GetStringMapString("destinations.temporary")
+	destMap := viper.GetStringMapString("destinations.0")
 
 	var dest models.LocalDestination
 	dest.Path = destMap["path"]
diff --git a/pkg/internal/services/recycler.go b/pkg/internal/services/recycler.go
index c3bc7f1..910956b 100644
--- a/pkg/internal/services/recycler.go
+++ b/pkg/internal/services/recycler.go
@@ -98,7 +98,7 @@ func RunScheduleDeletionTask() {
 
 func DeleteFile(meta models.Attachment) error {
 	if !meta.IsUploaded {
-		destMap := viper.GetStringMap("destinations.temporary")
+		destMap := viper.GetStringMap("destinations.0")
 		var dest models.LocalDestination
 		rawDest, _ := jsoniter.Marshal(destMap)
 		_ = jsoniter.Unmarshal(rawDest, &dest)
@@ -113,7 +113,7 @@ func DeleteFile(meta models.Attachment) error {
 
 	var destMap map[string]any
 	if meta.Destination == models.AttachmentDstTemporary {
-		destMap = viper.GetStringMap("destinations.temporary")
+		destMap = viper.GetStringMap("destinations.0")
 	} else {
 		destMap = viper.GetStringMap("destinations.permanent")
 	}
diff --git a/pkg/internal/services/uploader.go b/pkg/internal/services/uploader.go
index b4f132b..2343a79 100644
--- a/pkg/internal/services/uploader.go
+++ b/pkg/internal/services/uploader.go
@@ -19,7 +19,7 @@ import (
 )
 
 func UploadFileToTemporary(ctx *fiber.Ctx, file *multipart.FileHeader, meta models.Attachment) error {
-	destMap := viper.GetStringMap("destinations.temporary")
+	destMap := viper.GetStringMap(fmt.Sprintf("destinations.%d", meta.Destination))
 
 	var dest models.BaseDestination
 	rawDest, _ := jsoniter.Marshal(destMap)
@@ -36,7 +36,7 @@ func UploadFileToTemporary(ctx *fiber.Ctx, file *multipart.FileHeader, meta mode
 }
 
 func UploadChunkToTemporary(ctx *fiber.Ctx, cid string, file *multipart.FileHeader, meta models.Attachment) error {
-	destMap := viper.GetStringMap("destinations.temporary")
+	destMap := viper.GetStringMap("destinations.0")
 
 	var dest models.BaseDestination
 	rawDest, _ := jsoniter.Marshal(destMap)
@@ -58,7 +58,7 @@ func UploadChunkToTemporary(ctx *fiber.Ctx, cid string, file *multipart.FileHead
 }
 
 func UploadChunkToTemporaryWithRaw(ctx *fiber.Ctx, cid string, raw []byte, meta models.Attachment) error {
-	destMap := viper.GetStringMap("destinations.temporary")
+	destMap := viper.GetStringMap("destinations.0")
 
 	var dest models.BaseDestination
 	rawDest, _ := jsoniter.Marshal(destMap)
@@ -80,7 +80,7 @@ func UploadChunkToTemporaryWithRaw(ctx *fiber.Ctx, cid string, raw []byte, meta
 }
 
 func CheckChunkExistsInTemporary(meta models.Attachment, cid string) bool {
-	destMap := viper.GetStringMap("destinations.temporary")
+	destMap := viper.GetStringMap("destinations.0")
 
 	var dest models.LocalDestination
 	rawDest, _ := jsoniter.Marshal(destMap)
@@ -110,7 +110,7 @@ func ReUploadFileToPermanent(meta models.Attachment, dst int) error {
 	rawDest, _ := jsoniter.Marshal(destMap)
 	_ = jsoniter.Unmarshal(rawDest, &dest)
 
-	prevDestMap := viper.GetStringMap("destinations.temporary")
+	prevDestMap := viper.GetStringMap("destinations.0")
 
 	// Currently, the temporary destination only supports the local.
 	// So we can do this.
diff --git a/settings.toml b/settings.toml
index a5988af..ce0bc39 100644
--- a/settings.toml
+++ b/settings.toml
@@ -22,7 +22,7 @@ path = "uploads"
 [[destinations]]
 type = "local"
 path = "uploads/permanent"
-access_baseurl = "http://localhost:8004"
+access_baseurl = "http://192.168.50.133:8004"
 
 [security]
 internal_public_key = "keys/internal_public_key.pem"