local var name fixes

This commit is contained in:
2026-01-28 19:05:40 +01:00
parent 123af105f4
commit c0ab94510e
11 changed files with 107 additions and 107 deletions
+10 -10
View File
@@ -19,33 +19,33 @@ func NewDownloadController(service domain.DownloadServiceInterface) *DownloadCon
return &DownloadController{service: service}
}
func (c *DownloadController) serve(w http.ResponseWriter, r *http.Request, release *domain.Release, isSource bool) {
var filePath string
if isSource {
filePath = release.SourcePath
func (c *DownloadController) serve(w http.ResponseWriter, r *http.Request, release *domain.Release, is_source bool) {
var file_path string
if is_source {
file_path = release.SourcePath
} else {
filePath = release.CartridgePath
file_path = release.CartridgePath
}
absFilePath, err := filepath.Abs(filePath)
abs_file_path, err := filepath.Abs(file_path)
if err != nil {
http.Error(w, "Invalid file path", http.StatusInternalServerError)
return
}
absContentsDir, err := filepath.Abs(os.Getenv("FILE_CONTAINER_PATH"))
abs_contents_dir, err := filepath.Abs(os.Getenv("FILE_CONTAINER_PATH"))
if err != nil {
http.Error(w, "Invalid contents directory path", http.StatusInternalServerError)
return
}
if !strings.HasPrefix(absFilePath, absContentsDir) {
if !strings.HasPrefix(abs_file_path, abs_contents_dir) {
http.Error(w, "Access denied", http.StatusForbidden)
return
}
w.Header().Set("Content-Disposition", "attachment; filename="+filepath.Base(filePath))
http.ServeFile(w, r, filePath)
w.Header().Set("Content-Disposition", "attachment; filename="+filepath.Base(file_path))
http.ServeFile(w, r, file_path)
}
func (c *DownloadController) handleError(w http.ResponseWriter, err error) {
+7 -7
View File
@@ -15,10 +15,10 @@ type PlayController struct {
fileService domain.FileServiceInterface
}
func NewPlayController(softwareService domain.SoftwareServiceInterface, fileService domain.FileServiceInterface) *PlayController {
func NewPlayController(software_service domain.SoftwareServiceInterface, file_service domain.FileServiceInterface) *PlayController {
return &PlayController{
softwareService: softwareService,
fileService: fileService,
softwareService: software_service,
fileService: file_service,
}
}
@@ -36,15 +36,15 @@ func (c *PlayController) Play(w http.ResponseWriter, r *http.Request) {
return
}
var webPlayableRelease *domain.Release
var web_playable_release *domain.Release
for _, release := range software.Releases {
if release.Version == version && release.HTMLFolderPath != "" {
webPlayableRelease = &release
web_playable_release = &release
break
}
}
if webPlayableRelease == nil {
if web_playable_release == nil {
http.Error(w, "No web-playable version found for this software", http.StatusNotFound)
return
}
@@ -57,7 +57,7 @@ func (c *PlayController) Play(w http.ResponseWriter, r *http.Request) {
tmpl.Execute(w, map[string]interface{}{
"Software": software,
"WebPlayableRelease": webPlayableRelease,
"WebPlayableRelease": web_playable_release,
})
}
+5 -5
View File
@@ -5,12 +5,12 @@ import (
"teletype_softwares/lib/http_utils"
)
func StartHttpServer(domainInstance domain.Domain) {
func StartHttpServer(domain_instance domain.Domain) {
router := NewRouter(
NewSoftwareController(domainInstance.SoftwareService),
NewSoftwareUpdaterController(domainInstance.SoftwareUpdaterService),
NewDownloadController(domainInstance.DownloadService),
NewPlayController(domainInstance.SoftwareService, domainInstance.FileService),
NewSoftwareController(domain_instance.SoftwareService),
NewSoftwareUpdaterController(domain_instance.SoftwareUpdaterService),
NewDownloadController(domain_instance.DownloadService),
NewPlayController(domain_instance.SoftwareService, domain_instance.FileService),
NewRootController(),
).Init()
+10 -10
View File
@@ -15,18 +15,18 @@ type Router struct {
}
func NewRouter(
softwareController *SoftwareController,
softwareUpdaterController *SoftwareUpdaterController,
downloadController *DownloadController,
playController *PlayController,
rootController *RootController,
software_controller *SoftwareController,
software_updater_controller *SoftwareUpdaterController,
download_controller *DownloadController,
play_controller *PlayController,
root_controller *RootController,
) *Router {
return &Router{
softwareController: softwareController,
softwareUpdaterController: softwareUpdaterController,
downloadController: downloadController,
playController: playController,
rootController: rootController,
softwareController: software_controller,
softwareUpdaterController: software_updater_controller,
downloadController: download_controller,
playController: play_controller,
rootController: root_controller,
}
}