transitive commit

fisirc · Nov 23, 2024 · d446902 · d446902
1 parent 1befeec
commit d446902
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/stiller-backend/config.go b/stiller-backend/config.go
@@ -9,19 +9,24 @@ type ConfigType struct {
     DBPath     string
     Secret     []byte
     Admin      string
+    Host       string
+    FileBucket string
     BCryptCost int
 }
 
 func newConfig() *ConfigType {
     dotenv.Load()
 
+    hostname := dotenv.GetString("Host")
     return &ConfigType{
         Addr: dotenv.GetString("Addr"),
         FilesPath: dotenv.GetString("FilesPath"),
         DBPath: dotenv.GetString("DBPath"),
         Secret: []byte(dotenv.GetString("Secret")),
         BCryptCost: dotenv.GetInt("BCryptCost"),
         Admin: dotenv.GetString("Admin"),
+        Host: hostname,
+        FileBucket: hostname + "file/dl/",
     }
 }
 

diff --git a/stiller-backend/internal/handlers/file/filedl/handler.go b/stiller-backend/internal/handlers/file/filedl/handler.go
@@ -1,6 +1,7 @@
 package filedl
 
 import (
+	"log"
 	"net/http"
 	"stiller/internal/dbutils"
 	"stiller/internal/fsutils"
@@ -67,6 +68,7 @@ func Nethandler(w http.ResponseWriter, r *http.Request, params httprouter.Params
         handleutils.GenericLog(nil, "path '%s' doesnt exist", path)
     }
 
+    log.Println(path)
     http.ServeFile(w, r, path)
 }
 
diff --git a/stiller-backend/internal/handlers/file/filetree/handler.go b/stiller-backend/internal/handlers/file/filetree/handler.go
@@ -92,7 +92,7 @@ func Nethandler(w http.ResponseWriter, r *http.Request, params httprouter.Params
                     Id: new_id,
                     OwnerId: int(stmt.GetInt64("owner")),
                     Typeof: dbutils.StillerFileType(stmt.GetInt64("type")),
-                    Url: "https://pandadiestro.xyz/services/stiller/file/dl/" + strconv.Itoa(new_id),
+                    Url: stiller.StillerConfig.FileBucket + strconv.Itoa(new_id),
                     Path: stmt.GetText("path"),
                     Filename: stmt.GetText("filename"),
                     Title: stmt.GetText("title"),

diff --git a/stiller-backend/internal/handlers/file/upload/handler.go b/stiller-backend/internal/handlers/file/upload/handler.go
@@ -190,7 +190,7 @@ func NetHandler(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
         return
     }
 
-    new_file.Url = "https://pandadiestro.xyz/services/stiller/file/dl/" + strconv.Itoa(new_file.Id)
+    new_file.Url = stiller.StillerConfig.FileBucket + strconv.Itoa(new_file.Id)
 
     w.WriteHeader(http.StatusOK)
     jsonexp.MarshalWrite(w, new_file, jsonexp.DefaultOptionsV2())