Merge branch 'devel' into patch-1

Author: alexballas

Makefile

@@ -1,11 +1,10 @@
 LDFLAGS="-s -w"
-WINLDFLAGS="-H=windowsgui -s -w"
 
 build: clean
 	go build -trimpath -ldflags $(LDFLAGS) -o build/go2tv cmd/go2tv/go2tv.go
 
 windows: clean
-	env CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 go build -trimpath -ldflags $(WINLDFLAGS) -o build/go2tv.exe cmd/go2tv/go2tv.go
+	env CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 go build -trimpath -ldflags $(LDFLAGS) -o build/go2tv.exe cmd/go2tv/go2tv.go
 
 install: build
 	mkdir -vp /usr/local/bin/

README.md

@@ -62,7 +62,7 @@ This is a GUI only limitation.
 
 Build requirements and dependencies
 -----
-- Go v1.19+
+- Go v1.23+
 - ffmpeg (optional)
 
 **Build using Docker**
@@ -73,13 +73,21 @@ $ docker build --force-rm [--pull] -t go2tv github.com/alexballas/go2tv#main
 ```
 Notice the branch name after the `#`, as the above will build `main`. You can also build `devel` if you want to build the latest code. Usage under Docker is outside this document's scope, check Docker docs for more information, specially volume mounts and networking. [x11docker](https://github.com/mviereck/x11docker) might come handy to run GUI mode, although it's not tested, since main Docker usage is CLI.
 
+**Running using Docker**
+
+Example:
+``` console
+$ xhost +local:docker  # Allows Docker containers to connect to the X server
+$ docker run -it --network host -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix go2tv go2tv
+```
+
 Quick Start
 -----
 Download the app here https://github.com/alexballas/Go2TV/releases/latest. A single executable. No installation or external dependencies.
 
 **Transcoding (ffmpeg required)**
 
-Go2TV supports live video transcoding, if ffmpeg is installed. When transcoding, SEEK operations are not available. Transcoding offers the maximum compatibility with the various file formats and devices. Only works with video files.
+Go2TV supports live video transcoding, if ffmpeg is installed. When transcoding, SEEK operations are not available. Transcoding offers the maximum compatibility with the various file formats and devices. Only works with video files. *Note:* The Flatpak version of Go2TV bundles ffmpeg.
 
 **MKV/MP4 Subtitle Selection Support (ffmpeg required)**
 

assets/screenshots/Screenshot_dark.png

@@ -35,8 +35,8 @@ var (
 	listPtr      = flag.Bool("l", false, "List all available UPnP/DLNA Media Renderer models and URLs.")
 	versionPtr   = flag.Bool("version", false, "Print version.")
 
-	ErrNoCombi    = errors.New("can't combine -l with other flags")
-	ErrFailtoList = errors.New("failed to list devices")
+	errNoCombi    = errors.New("can't combine -l with other flags")
+	errFailtoList = errors.New("failed to list devices")
 )
 
 type dummyScreen struct {
@@ -195,12 +195,12 @@ func listFlagFunction() error {
 	})
 
 	if flagsEnabled > 1 {
-		return ErrNoCombi
+		return errNoCombi
 	}
 
 	deviceList, err := devices.LoadSSDPservices(1)
 	if err != nil {
-		return ErrFailtoList
+		return errFailtoList
 	}
 
 	fmt.Println()

assets/screenshots/Screenshot_light.png

@@ -1 +1 @@
-1.17.1
+1.18.0

cmd/go2tv-lite/go2tv.go

@@ -0,0 +1,8 @@
+Website = "https://go2tv.app"
+
+[Details]
+  Icon = "assets/go2tv-icon-desktop-512.png"
+  Name = "go2tv"
+  ID = "com.go2tv.go2tv"
+  Version = "1.18.0"
+  Build = 1

cmd/go2tv-lite/version.txt

@@ -37,8 +37,8 @@ var (
 	listPtr      = flag.Bool("l", false, "List all available UPnP/DLNA Media Renderer models and URLs.")
 	versionPtr   = flag.Bool("version", false, "Print version.")
 
-	ErrNoCombi    = errors.New("can't combine -l with other flags")
-	ErrFailtoList = errors.New("failed to list devices")
+	errNoCombi    = errors.New("can't combine -l with other flags")
+	errFailtoList = errors.New("failed to list devices")
 )
 
 type flagResults struct {
@@ -106,7 +106,7 @@ func run() error {
 	}
 
 	if flagRes.gui {
-		scr := gui.InitFyneNewScreen(version)
+		scr := gui.NewFyneScreen(version)
 		gui.Start(exitCTX, scr)
 		return nil
 	}
@@ -191,12 +191,12 @@ func listFlagFunction() error {
 	})
 
 	if flagsEnabled > 1 {
-		return ErrNoCombi
+		return errNoCombi
 	}
 
 	deviceList, err := devices.LoadSSDPservices(1)
 	if err != nil {
-		return ErrFailtoList
+		return errFailtoList
 	}
 
 	fmt.Println()

cmd/go2tv/FyneApp.toml

@@ -1 +1 @@
-1.17.1
+1.18.0

cmd/go2tv/go2tv.go

@@ -21,7 +21,7 @@ var (
 func LoadSSDPservices(delay int) (map[string]string, error) {
 	// Reset device list every time we call this.
 	urlList := make(map[string]string)
-	list, err := ssdp.Search(ssdp.All, delay, "")
+	list, err := ssdp.Search(ssdp.All, delay, "239.255.255.250:1900")
 	if err != nil {
 		return nil, fmt.Errorf("LoadSSDPservices search error: %w", err)
 	}