feat: link version display to GitHub commit and clean up sidebar

Author: Datanoise

main.go

@@ -23,6 +23,7 @@ import (
 
 var (
 	Version = "dev"
+	Commit  = "unknown"
 
 	configPath  = flag.String("config", "tinyice.json", "Path to configuration file")
 	bindHost    = flag.String("host", "0.0.0.0", "Network interface to bind to")
@@ -106,11 +107,15 @@ func main() {
 	}
 	flag.Parse()
 
-	// Try to get version from build info if not set via ldflags
-	if Version == "dev" {
-		if info, ok := debug.ReadBuildInfo(); ok {
-			if info.Main.Version != "" && info.Main.Version != "(devel)" {
-				Version = info.Main.Version
+	// Try to get version and commit from build info if not set via ldflags
+	if info, ok := debug.ReadBuildInfo(); ok {
+		if Version == "dev" && info.Main.Version != "" && info.Main.Version != "(devel)" {
+			Version = info.Main.Version
+		}
+		for _, setting := range info.Settings {
+			if setting.Key == "vcs.revision" {
+				Commit = setting.Value
+				break
 			}
 		}
 	}
@@ -162,7 +167,7 @@ func main() {
 		cfg.AutoUpdate = true
 	}
 
-	srv := server.NewServer(cfg, authLogger, Version)
+	srv := server.NewServer(cfg, authLogger, Version, Commit)
 
 	// Start Updater if enabled
 	if cfg.AutoUpdate {

server/server.go

@@ -72,6 +72,7 @@ type Server struct {
 	mpdServer   *relay.MPDServer
 	tmpl        *template.Template
 	Version     string
+	Commit      string
 	httpServers []*http.Server
 	startTime   time.Time
 	AuthLog     *logrus.Logger
@@ -189,7 +190,7 @@ func (p *protocolSniffer) sniff() {
 	}
 }
 
-func NewServer(cfg *config.Config, authLog *logrus.Logger, version string) *Server {
+func NewServer(cfg *config.Config, authLog *logrus.Logger, version, commit string) *Server {
 	tmpl := template.New("base")
 	tmpl, err := tmpl.ParseFS(templateFS, "templates/*.html")
 	if err != nil {
@@ -211,6 +212,7 @@ func NewServer(cfg *config.Config, authLog *logrus.Logger, version string) *Serv
 		StreamerM:    relay.NewStreamerManager(r, cfg),
 		tmpl:         tmpl,
 		Version:      version,
+		Commit:       commit,
 		startTime:    time.Now(),
 		AuthLog:      authLog,
 		sessions:     make(map[string]*session),
@@ -1591,6 +1593,7 @@ func (s *Server) handleAdmin(w http.ResponseWriter, r *http.Request) {
 		"CSRFToken":      csrf,
 		"Streamers":      s.StreamerM.GetStreamers(),
 		"Version":        s.Version,
+		"Commit":         s.Commit,
 	}
 	if err := s.tmpl.ExecuteTemplate(w, "admin.html", data); err != nil {
 		if !strings.Contains(err.Error(), "broken pipe") {
@@ -2907,6 +2910,7 @@ func (s *Server) handleAutoDJStudio(w http.ResponseWriter, r *http.Request) {
 		"Config":    s.Config,
 		"User":      user,
 		"Version":   s.Version,
+		"Commit":    s.Commit,
 	}
 
 	w.Header().Set("Content-Type", "text/html")

server/templates/admin.html

@@ -120,10 +120,10 @@
 
                 <a href="/logout" class="nav-link" style="color: var(--danger); margin-top: 1rem; text-decoration: none;"><i data-lucide="log-out"></i> Sign Out</a>
             </div>
-                          <div style="margin-top: auto; padding-top: 2rem;">
-                              <div style="font-size: 0.8rem; color: var(--text-dim); margin-bottom: 1rem;">User: <strong>{{.User.Username}}</strong> <span class="role-badge {{if eq .User.Role "superadmin"}}role-super{{else}}role-admin{{end}}">{{.User.Role}}</span></div>
-                              <div style="font-size: 0.75rem; color: var(--text-dim);">Powered by <strong>TinyIce {{.Version}}</strong><br>Host: {{.Config.HostName}}</div>
-                          </div>        </aside>
+                                        <div style="margin-top: auto; padding-top: 2rem;">
+                                            <div style="font-size: 0.8rem; color: var(--text-dim); margin-bottom: 1rem;">User: <strong>{{.User.Username}}</strong> <span class="role-badge {{if eq .User.Role "superadmin"}}role-super{{else}}role-admin{{end}}">{{.User.Role}}</span></div>
+                                            <div style="font-size: 0.75rem; color: var(--text-dim);">Powered by <a href="https://github.com/DatanoiseTV/tinyice/{{if .Commit}}commit/{{.Commit}}{{else}}releases/latest{{end}}" target="_blank" style="color: inherit; text-decoration: none;"><strong>TinyIce {{.Version}}</strong></a></div>
+                                        </div>        </aside>
         <main>
             <div id="tab-overview" class="tab-content active">
                 <h1 class="page-title"><i data-lucide="layout-dashboard"></i> Dashboard</h1>

server/templates/autodj_studio.html

@@ -132,7 +132,7 @@
             <a href="/admin#tab-streamer" class="studio-logo">
                 <i data-lucide="chevron-left" style="width: 20px; color: var(--text-dim);"></i>
                 <img src="/assets/logo.png" alt="TinyIce">
-                <span>STUDIO <span style="font-size: 0.6rem; color: var(--text-dim); margin-left: 0.2rem; font-weight: 400;">{{.Version}}</span></span>
+                <span>STUDIO <a href="https://github.com/DatanoiseTV/tinyice/{{if .Commit}}commit/{{.Commit}}{{else}}releases/latest{{end}}" target="_blank" style="font-size: 0.6rem; color: var(--text-dim); margin-left: 0.2rem; font-weight: 400; text-decoration: none;">{{.Version}}</a></span>
             </a>
             <div class="mount-badge">{{.Streamer.Mount}}</div>
         </div>