colin/go2tv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce NewTVPayload function

Browse Source
This commit is contained in:
Alex Ballas
2022-08-31 20:51:14 +03:00
parent 20550583fb
commit 60dee3c34c
6 changed files with 95 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/go2tv-lite/go2tv.go
View File

@@ -15,9 +15,7 @@ import (
"runtime"
"sort"
"strings"
"sync"
"syscall"
"time"
"github.com/alexballas/go2tv/devices"
"github.com/alexballas/go2tv/httphandlers"
@@ -66,7 +64,6 @@ func run() error {
var mediaType string
var mediaFile interface{}
var isSeek bool
var tvdata *soapcalls.TVPayload
var s *httphandlers.HTTPserver
keyboardExitCTX, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
@@ -151,42 +148,21 @@ func run() error {
return err
}
upnpServicesURLs, err := soapcalls.DMRextractor(flagRes.dmrURL)
if err != nil {
return err
}
whereToListen, err := utils.URLtoListenIPandPort(flagRes.dmrURL)
if err != nil {
return err
}
scr := &dummyScreen{ctxCancel: cancel2}
callbackPath, err := utils.RandomString()
tvdata, err := soapcalls.NewTVPayload(soapcalls.Options{
DMR: flagRes.dmrURL,
Media: absMediaFile,
Subs: absSubtitlesFile,
Mtype: mediaType,
Transcode: *transcodePtr,
Seek: isSeek,
})
if err != nil {
return err
}
tvdata = &soapcalls.TVPayload{
ControlURL: upnpServicesURLs.AvtransportControlURL,
EventURL: upnpServicesURLs.AvtransportEventSubURL,
RenderingControlURL: upnpServicesURLs.RenderingControlURL,
ConnectionManagerURL: upnpServicesURLs.ConnectionManagerURL,
CallbackURL: "http://" + whereToListen + "/" + callbackPath,
MediaURL: "http://" + whereToListen + "/" + utils.ConvertFilename(absMediaFile),
SubtitlesURL: "http://" + whereToListen + "/" + utils.ConvertFilename(absSubtitlesFile),
MediaType: mediaType,
CurrentTimers: make(map[string]*time.Timer),
MediaRenderersStates: make(map[string]*soapcalls.States),
InitialMediaRenderersStates: make(map[string]bool),
RWMutex: &sync.RWMutex{},
Transcode: *transcodePtr,
Seekable: isSeek,
Logging: os.Stderr,
}
s = httphandlers.NewServer(whereToListen)
s = httphandlers.NewServer(tvdata.ListenAddress())
serverStarted := make(chan error)
// We pass the tvdata here as we need the callback handlers to be able to react

40
cmd/go2tv/go2tv.go
View File

@@ -14,9 +14,7 @@ import (
"runtime"
"sort"
"strings"
"sync"
"syscall"
"time"
"errors"
@@ -144,44 +142,24 @@ func run() error {
return err
}
upnpServicesURLs, err := soapcalls.DMRextractor(flagRes.dmrURL)
if err != nil {
return err
}
whereToListen, err := utils.URLtoListenIPandPort(flagRes.dmrURL)
if err != nil {
return err
}
scr, err := interactive.InitTcellNewScreen(cancel2)
if err != nil {
return err
}
callbackPath, err := utils.RandomString()
tvdata, err := soapcalls.NewTVPayload(soapcalls.Options{
DMR: flagRes.dmrURL,
Media: absMediaFile,
Subs: absSubtitlesFile,
Mtype: mediaType,
Transcode: *transcodePtr,
Seek: isSeek,
})
if err != nil {
return err
}
tvdata := &soapcalls.TVPayload{
ControlURL: upnpServicesURLs.AvtransportControlURL,
EventURL: upnpServicesURLs.AvtransportEventSubURL,
RenderingControlURL: upnpServicesURLs.RenderingControlURL,
ConnectionManagerURL: upnpServicesURLs.ConnectionManagerURL,
CallbackURL: "http://" + whereToListen + "/" + callbackPath,
MediaURL: "http://" + whereToListen + "/" + utils.ConvertFilename(absMediaFile),
SubtitlesURL: "http://" + whereToListen + "/" + utils.ConvertFilename(absSubtitlesFile),
MediaType: mediaType,
CurrentTimers: make(map[string]*time.Timer),
MediaRenderersStates: make(map[string]*soapcalls.States),
InitialMediaRenderersStates: make(map[string]bool),
RWMutex: &sync.RWMutex{},
Transcode: *transcodePtr,
Seekable: isSeek,
}
s := httphandlers.NewServer(whereToListen)
s := httphandlers.NewServer(tvdata.ListenAddress())
serverStarted := make(chan error)
// We pass the tvdata here as we need the callback handlers to be able to react