bagas/filekeeper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update app instance structure to include both mailserver and logger

Browse Source
This commit is contained in:
Bagas Aulia Rezki
2024-08-18 13:35:07 +07:00
parent 7df02c270b
commit d64a4a587e
23 changed files with 147 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
handler/download/download.go
View File

@ -1,21 +1,15 @@
package downloadHandler
import (
"github.com/fossyy/filekeeper/app"
"github.com/fossyy/filekeeper/view/client/download"
"net/http"
"github.com/fossyy/filekeeper/db"
"github.com/fossyy/filekeeper/logger"
"github.com/fossyy/filekeeper/types"
"github.com/fossyy/filekeeper/utils"
)
var log *logger.AggregatedLogger
func init() {
log = logger.Logger()
}
func GET(w http.ResponseWriter, r *http.Request) {
userSession := r.Context().Value("user").(types.User)
files, err := db.DB.GetFiles(userSession.UserID.String())
@ -38,7 +32,7 @@ func GET(w http.ResponseWriter, r *http.Request) {
err = component.Render(r.Context(), w)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
log.Error(err.Error())
app.Server.Logger.Error(err.Error())
return
}
}

16
handler/download/file/file.go
View File

@ -1,26 +1,20 @@
package downloadFileHandler
import (
"github.com/fossyy/filekeeper/app"
"net/http"
"os"
"path/filepath"
"github.com/fossyy/filekeeper/db"
"github.com/fossyy/filekeeper/logger"
)
var log *logger.AggregatedLogger
func init() {
log = logger.Logger()
}
func GET(w http.ResponseWriter, r *http.Request) {
fileID := r.PathValue("id")
file, err := db.DB.GetFile(fileID)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
log.Error(err.Error())
app.Server.Logger.Error(err.Error())
return
}
@ -31,7 +25,7 @@ func GET(w http.ResponseWriter, r *http.Request) {
saveFolder := filepath.Join(basePath, file.OwnerID.String(), file.ID.String())
if filepath.Dir(saveFolder) != filepath.Join(basePath, file.OwnerID.String()) {
log.Error("invalid path")
app.Server.Logger.Error("invalid path")
w.WriteHeader(http.StatusInternalServerError)
return
}
@ -39,7 +33,7 @@ func GET(w http.ResponseWriter, r *http.Request) {
openFile, err := os.OpenFile(filepath.Join(saveFolder, file.Name), os.O_RDONLY, 0)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
log.Error(err.Error())
app.Server.Logger.Error(err.Error())
return
}
defer openFile.Close()
@ -47,7 +41,7 @@ func GET(w http.ResponseWriter, r *http.Request) {
stat, err := openFile.Stat()
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
log.Error(err.Error())
app.Server.Logger.Error(err.Error())
return
}