cowch/lst
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(controller): changed to actaully update both main and old app

Browse Source
This commit is contained in:
Blake Matthes
2025-10-17 11:17:14 -05:00
parent 953af5e0fe
commit 0d1f96333b
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
controller/update.go
View File

@@ -94,14 +94,24 @@ func UpdateApp(server *socketio.Server) <-chan string {
msg = "Running App Update" msg = "Running App Update"
updates <- msg updates <- msg
server.BroadcastToRoom("/", "update", "updateLogs", msg) server.BroadcastToRoom("/", "update", "updateLogs", msg)
if err := runNPMInstall(rootDir); err != nil { if err := runNPMInstall(rootDir, ""); err != nil {
server.BroadcastToRoom("/", "update", "updateLogs", fmt.Sprintf("npm install failed: %v", err))
}
if err := runNPMInstall(rootDir, "lstV2"); err != nil {
server.BroadcastToRoom("/", "update", "updateLogs", fmt.Sprintf("npm install failed: %v", err)) server.BroadcastToRoom("/", "update", "updateLogs", fmt.Sprintf("npm install failed: %v", err))
} }
msg = "Running DB Migrations" msg = "Running DB Migrations"
updates <- msg updates <- msg
server.BroadcastToRoom("/", "update", "updateLogs", msg) server.BroadcastToRoom("/", "update", "updateLogs", msg)
if err := runNPMMigrate(rootDir); err != nil { if err := runNPMMigrate(rootDir, ""); err != nil {
msg = fmt.Sprintf("npm migrate failed: %v", err)
updates <- msg
server.BroadcastToRoom("/", "update", "updateLogs", msg)
}
if err := runNPMMigrate(rootDir, "lstV2"); err != nil {
msg = fmt.Sprintf("npm migrate failed: %v", err) msg = fmt.Sprintf("npm migrate failed: %v", err)
updates <- msg updates <- msg
server.BroadcastToRoom("/", "update", "updateLogs", msg) server.BroadcastToRoom("/", "update", "updateLogs", msg)
@@ -286,23 +296,36 @@ func extractVersion(filename string) (int, error) {
return strconv.Atoi(m[1]) return strconv.Atoi(m[1])
} }
func runNPMInstall(rootDir string) error { func runNPMInstall(rootDir string, folder string) error {
frontendDir := filepath.Join(rootDir, "frontend") // adapt if needed
var folderDir string
if folder == "" || folder == "." {
folderDir = rootDir
} else {
folderDir = filepath.Join(rootDir, folder)
}
cmd := exec.Command("npm", "install") cmd := exec.Command("npm", "install")
cmd.Dir = frontendDir cmd.Dir = folderDir
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
log.Println("Running npm install in", frontendDir) log.Println("Running npm install in", folderDir)
return cmd.Run() return cmd.Run()
} }
func runNPMMigrate(rootDir string) error { func runNPMMigrate(rootDir string, folder string) error {
frontendDir := filepath.Join(rootDir, "frontend") // same dir
var folderDir string
if folder == "" || folder == "." {
folderDir = rootDir
} else {
folderDir = filepath.Join(rootDir, folder)
}
cmd := exec.Command("npm", "run", "db:migrate") cmd := exec.Command("npm", "run", "db:migrate")
cmd.Dir = frontendDir cmd.Dir = folderDir
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
log.Println("Running npm run db:migrate in", frontendDir) log.Println("Running npm run db:migrate in", folderDir)
return cmd.Run() return cmd.Run()
} }