Skip to content

Commit 5be5742

Browse files
Clean the project
Signed-off-by: Marcel Goerentz <[email protected]>
1 parent 10f41bc commit 5be5742

File tree

7 files changed

+59
-58
lines changed

7 files changed

+59
-58
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 fyb3roptik@threadfin
3+
Copyright (c) 2022 mgoerentz@threadfin
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module threadfin
22

3-
go 1.18
3+
go 1.22
44

55
require (
66
github.com/avfs/avfs v0.30.0
7-
github.com/gorilla/websocket v1.5.0
8-
github.com/hashicorp/go-version v1.6.0
7+
github.com/gorilla/websocket v1.5.3
8+
github.com/hashicorp/go-version v1.7.0
99
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
10-
github.com/koron/go-ssdp v0.0.3
11-
golang.org/x/text v0.3.7
10+
github.com/koron/go-ssdp v0.0.4
11+
golang.org/x/text v0.16.0
1212
)
1313

1414
require (
15-
golang.org/x/net v0.0.0-20220517181318-183a9ca12b87 // indirect
16-
golang.org/x/sys v0.0.0-20220519141025-dcacdad47464 // indirect
15+
golang.org/x/net v0.26.0 // indirect
16+
golang.org/x/sys v0.21.0 // indirect
1717
)

go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
github.com/avfs/avfs v0.30.0 h1:rrcJMJNdqXj8bsVNEXItbA4Oj1NxOE1/h+YtJ3ah2z8=
22
github.com/avfs/avfs v0.30.0/go.mod h1:CSGcc8vnwdripDtbXQ6hzmKazmnJFZ7m2ObyomzneEg=
3-
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
4-
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
5-
github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
6-
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
3+
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
4+
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
5+
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
6+
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
77
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
88
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
9-
github.com/koron/go-ssdp v0.0.3 h1:JivLMY45N76b4p/vsWGOKewBQu6uf39y8l+AQ7sDKx8=
10-
github.com/koron/go-ssdp v0.0.3/go.mod h1:b2MxI6yh02pKrsyNoQUsk4+YNikaGhe4894J+Q5lDvA=
11-
golang.org/x/net v0.0.0-20220517181318-183a9ca12b87 h1:cCR+9mKLOGyX4Zx+uBZDXEDAQsvKQ/XbW4vreG5v1jU=
12-
golang.org/x/net v0.0.0-20220517181318-183a9ca12b87/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
13-
golang.org/x/sys v0.0.0-20220519141025-dcacdad47464 h1:MpIuURY70f0iKp/oooEFtB2oENcHITo/z1b6u41pKCw=
14-
golang.org/x/sys v0.0.0-20220519141025-dcacdad47464/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
15-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
16-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
9+
github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
10+
github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
11+
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
12+
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
13+
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
14+
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
15+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
16+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=

src/buffer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ func getTuner(id, playlistType string) (tuner int) {
12121212
func initBufferVFS(virtual bool) {
12131213

12141214
if virtual {
1215-
bufferVFS = memfs.New(memfs.WithMainDirs())
1215+
bufferVFS = memfs.New()
12161216
} else {
12171217
bufferVFS = osfs.New()
12181218
}

src/system.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ import (
44
"encoding/json"
55
"errors"
66
"fmt"
7-
"log"
87
"os"
98
"reflect"
109
"strings"
1110
"time"
1211
)
1312

13+
var onlyOnce = false
14+
1415
// Entwicklerinfos anzeigen
1516
func showDevInfo() {
1617

@@ -244,7 +245,7 @@ func saveSettings(settings SettingsStruct) (err error) {
244245
Settings = settings
245246

246247
if System.Dev {
247-
Settings.UUID = "2019-01-DEV-Threadfin!"
248+
Settings.UUID = "2024-06-DEV-Threadfin!"
248249
}
249250

250251
setDeviceID()
@@ -278,10 +279,11 @@ func setGlobalDomain(domain string) {
278279
System.Addresses.XML = System.ServerProtocol.XML + "://" + System.Domain + "/xmltv/threadfin.xml"
279280
}
280281

281-
if Settings.EpgSource != "XEPG" {
282-
log.Println("SOURCE: ", Settings.EpgSource)
282+
if Settings.EpgSource != "XEPG" && !onlyOnce {
283+
showInfo("SOURCE:" + Settings.EpgSource)
283284
System.Addresses.M3U = getErrMsg(2106)
284285
System.Addresses.XML = getErrMsg(2106)
286+
onlyOnce = true
285287
}
286288
}
287289

src/update.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"errors"
66
"fmt"
77
"io"
8-
"log"
98
"net/http"
109

1110
up2date "threadfin/src/internal/up2date/client"
@@ -36,7 +35,7 @@ func BinaryUpdate() (err error) {
3635

3736
up2date.Init()
3837

39-
log.Println("BRANCH: ", System.Branch)
38+
showInfo("BRANCH:" + System.Branch)
4039
switch System.Branch {
4140

4241
// Update von GitHub
@@ -77,7 +76,7 @@ func BinaryUpdate() (err error) {
7776
if !release.Prerelease {
7877
updater.Response.Version = release.TagName
7978
latest = release.TagName
80-
log.Println("TAG LATEST: ", release.TagName)
79+
showInfo("TAG LATEST:" + release.TagName)
8180
break
8281
}
8382
}
@@ -88,7 +87,7 @@ func BinaryUpdate() (err error) {
8887
updater.Response.Status = true
8988
updater.Response.UpdateBIN = File
9089

91-
log.Println("FILE: ", updater.Response.UpdateBIN)
90+
showInfo("FILE:" + updater.Response.UpdateBIN)
9291

9392
// Update vom eigenen Server
9493
default:

0 commit comments

Comments
 (0)