Skip to content

Commit

Permalink
Merge pull request #78 from alexballas/devel
Browse files Browse the repository at this point in the history 
v1.16.0
  • Loading branch information
@alexballas
alexballas authored May 7, 2024
2 parents e0d3ddb + a20d2be commit 17889b6
Show file tree
Hide file tree
Showing 1,909 changed files with 492 additions and 813,061 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-android.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set env
run: if grep -Fxq "devel" cmd/go2tv/version.txt;then echo "GO2TV_VERSION=$(cat cmd/go2tv/version.txt)";else echo "GO2TV_VERSION=v$(cat cmd/go2tv/version.txt)";fi >> $GITHUB_ENV

- uses: WillAbides/setup-go-faster@v1.7.0
- uses: WillAbides/setup-go-faster@v1.11.0
id: setup-go-faster
with:
go-version: "*"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-arm.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build for ARM
name: Build for ARMv6 (32-bit)
on: [push]

jobs:
Expand All @@ -16,6 +16,7 @@ jobs:
copy_repository_path: /go2tv_dir
copy_artifact_path: go2tv
image_additional_mb: 800
base_image: raspios_lite:latest
commands: |
cd /
sudo apt update
Expand All @@ -27,7 +28,7 @@ jobs:
export GOROOT=/go
cd /go2tv_dir
/go/bin/go build -ldflags "-s -w" -o go2tv cmd/go2tv/go2tv.go
- uses: actions/upload-artifact@v2
with:
name: go2tv_${{ env.GO2TV_VERSION }}_linux_arm
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/build-arm64.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Build for ARMv8 (64-bit)
on: [push]

jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

- name: Set env
run: if grep -Fxq "devel" cmd/go2tv/version.txt;then echo "GO2TV_VERSION=$(cat cmd/go2tv/version.txt)";else echo "GO2TV_VERSION=v$(cat cmd/go2tv/version.txt)";fi >> $GITHUB_ENV

- uses: pguyot/arm-runner-action@v2
id: main_image
with:
copy_repository_path: /go2tv_dir
copy_artifact_path: go2tv
image_additional_mb: 800
base_image: raspios_lite_arm64:latest
commands: |
cd /
sudo apt update
sudo apt install -y xorg-dev
sudo apt clean
wget -nv https://go.dev/dl/go1.20.4.linux-arm64.tar.gz
tar -xzf go1.20.4.linux-arm64.tar.gz
rm go1.20.4.linux-arm64.tar.gz
export GOROOT=/go
cd /go2tv_dir
/go/bin/go build -ldflags "-s -w" -o go2tv cmd/go2tv/go2tv.go
- uses: actions/upload-artifact@v2
with:
name: go2tv_${{ env.GO2TV_VERSION }}_linux_arm64
path: |
LICENSE
README.md
go2tv
retention-days: 2
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set env
run: if grep -Fxq "devel" cmd/go2tv/version.txt;then echo "GO2TV_VERSION=$(cat cmd/go2tv/version.txt)";else echo "GO2TV_VERSION=v$(cat cmd/go2tv/version.txt)";fi >> $GITHUB_ENV

- uses: WillAbides/setup-go-faster@v1.7.0
- uses: WillAbides/setup-go-faster@v1.11.0
id: setup-go-faster
with:
go-version: "*"
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/build-mac-intel.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build for MacOS Intel
on: [push]

jobs:
build:
runs-on: macos-latest
strategy:
fail-fast: false

steps:
- uses: actions/checkout@v3

- name: Set env
run: if grep -Fxq "devel" cmd/go2tv/version.txt;then echo "GO2TV_VERSION=$(cat cmd/go2tv/version.txt)";else echo "GO2TV_VERSION=v$(cat cmd/go2tv/version.txt)";fi >> $GITHUB_ENV

- uses: WillAbides/[email protected]
id: setup-go-faster
with:
go-version: "*"

- name: Install fyne
run: go install fyne.io/fyne/v2/cmd/fyne@latest

- name: Package (macOS)
run: cd cmd/go2tv && fyne package --release -os darwin -icon ../../assets/go2tv-icon-desktop.png && mv go2tv.app ../../

- uses: actions/upload-artifact@v2
with:
name: go2tv_${{ env.GO2TV_VERSION }}_macOS_amd64
path: |
LICENSE
README.md
go2tv.app/
retention-days: 2
10 changes: 5 additions & 5 deletions .github/workflows/build-mac.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build for MacOS
name: Build for MacOS Apple Silicon
on: [push]

jobs:
Expand All @@ -13,20 +13,20 @@ jobs:
- name: Set env
run: if grep -Fxq "devel" cmd/go2tv/version.txt;then echo "GO2TV_VERSION=$(cat cmd/go2tv/version.txt)";else echo "GO2TV_VERSION=v$(cat cmd/go2tv/version.txt)";fi >> $GITHUB_ENV

- uses: WillAbides/setup-go-faster@v1.7.0
- uses: WillAbides/setup-go-faster@v1.14.0
id: setup-go-faster
with:
go-version: "*"

- name: Install fyne
run: go install fyne.io/fyne/v2/cmd/fyne@latest

- name: Package (macOS)
run: cd cmd/go2tv && fyne package --release -os darwin -icon ../../assets/go2tv-icon-desktop.png && mv go2tv.app ../../
run: cd cmd/go2tv && GOARCH=arm64 fyne package --release -os darwin -icon ../../assets/go2tv-icon-desktop.png && mv go2tv.app ../../

- uses: actions/upload-artifact@v2
with:
name: go2tv_${{ env.GO2TV_VERSION }}_macOS_amd64
name: go2tv_${{ env.GO2TV_VERSION }}_macOS_arm64
path: |
LICENSE
README.md
Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/build-mac_m1.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set env
run: if grep -Fxq "devel" cmd/go2tv/version.txt;then echo "GO2TV_VERSION=$(cat cmd/go2tv/version.txt)";else echo "GO2TV_VERSION=v$(cat cmd/go2tv/version.txt)";fi >> $GITHUB_ENV

- uses: WillAbides/setup-go-faster@v1.7.0
- uses: WillAbides/setup-go-faster@v1.11.0
id: setup-go-faster
with:
go-version: "*"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: WillAbides/setup-go-faster@v1.7.0
- uses: WillAbides/setup-go-faster@v1.11.0
id: setup-go-faster
with:
go-version: "*"
Expand Down
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<div align="center">
<p>

![Go](https://github.com/alexballas/Go2TV/workflows/Go/badge.svg)
[![Go Report Card](https://goreportcard.com/badge/github.com/alexballas/Go2TV)](https://goreportcard.com/report/github.com/alexballas/Go2TV)
[![Release Version](https://img.shields.io/github/v/release/alexballas/Go2TV?label=Release)](https://github.com/alexballas/Go2TV/releases/latest)
[![Tests](https://github.com/alexballas/go2tv/actions/workflows/go.yml/badge.svg)](https://github.com/alexballas/go2tv/actions/workflows/go.yml)
Expand All @@ -16,6 +15,7 @@
[![Build for Android](https://github.com/alexballas/go2tv/actions/workflows/build-android.yml/badge.svg)](https://github.com/alexballas/go2tv/actions/workflows/build-android.yml)
[![Build for Linux](https://github.com/alexballas/go2tv/actions/workflows/build-linux.yml/badge.svg)](https://github.com/alexballas/go2tv/actions/workflows/build-linux.yml)
[![Build for MacOS](https://github.com/alexballas/go2tv/actions/workflows/build-mac.yml/badge.svg)](https://github.com/alexballas/go2tv/actions/workflows/build-mac.yml)
[![Build for MacOS M1](https://github.com/alexballas/go2tv/actions/workflows/build-mac_m1.yml/badge.svg)](https://github.com/alexballas/go2tv/actions/workflows/build-mac_m1.yml)
[![Build for Windows](https://github.com/alexballas/go2tv/actions/workflows/build-windows.yml/badge.svg)](https://github.com/alexballas/go2tv/actions/workflows/build-windows.yml)
</p>
Cast your media files to UPnP/DLNA Media Renderers and Smart TVs.
Expand All @@ -24,6 +24,8 @@ Cast your media files to UPnP/DLNA Media Renderers and Smart TVs.
---
GUI mode
-----
![](https://i.imgur.com/Ga3hLJM.gif)

![](https://i.imgur.com/Pw44BYD.png)
![](https://i.imgur.com/JeUxGGd.png)

Expand Down
Binary file added assets/dragdrop.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/dragdrop.mp4
View file
Binary file not shown.
Binary file modified assets/go2tv-icon-android.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/output.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions cmd/go2tv-lite/go2tv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ func main() {
}

func run() error {
var absMediaFile string
var mediaType string
var absMediaFile, mediaType string
var mediaFile interface{}
var isSeek bool
var s *httphandlers.HTTPserver
Expand Down Expand Up @@ -154,7 +153,7 @@ func run() error {
Mtype: mediaType,
Transcode: *transcodePtr,
Seek: isSeek,
Logging: nil,
LogOutput: nil,
})
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/go2tv-lite/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.0
1.16.0
3 changes: 1 addition & 2 deletions cmd/go2tv/go2tv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ func main() {
}

func run() error {
var absMediaFile string
var mediaType string
var absMediaFile, mediaType string
var mediaFile interface{}
var isSeek bool

Expand Down
2 changes: 1 addition & 1 deletion cmd/go2tv/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.0
1.16.0
62 changes: 31 additions & 31 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
module github.com/alexballas/go2tv

go 1.19
go 1.22

require (
fyne.io/fyne/v2 v2.3.3
fyne.io/fyne/v2 v2.4.5
github.com/alexballas/go-ssdp v0.0.3
github.com/gdamore/tcell/v2 v2.6.0
github.com/gdamore/tcell/v2 v2.7.4
github.com/h2non/filetype v1.1.3
github.com/hashicorp/go-retryablehttp v0.7.2
github.com/mattn/go-runewidth v0.0.14
github.com/hashicorp/go-retryablehttp v0.7.5
github.com/mattn/go-runewidth v0.0.15
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.29.0
github.com/rs/zerolog v1.32.0
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
golang.org/x/time v0.3.0
golang.org/x/time v0.5.0
)

require (
fyne.io/systray v1.10.1-0.20230312215936-7f71b037e260 // indirect
fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fredbi/uri v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 // indirect
github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33 // indirect
github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345 // indirect
github.com/gdamore/encoding v1.0.0 // indirect
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
github.com/go-text/typesetting v0.0.0-20230326170714-a90f4704aff7 // indirect
github.com/fredbi/uri v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fyne-io/gl-js v0.0.0-20230506162202-1fdaa286a934 // indirect
github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a // indirect
github.com/fyne-io/image v0.0.0-20240121103648-c3c798e60e6b // indirect
github.com/gdamore/encoding v1.0.1 // indirect
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240307211618-a69d953ea142 // indirect
github.com/go-text/render v0.1.0 // indirect
github.com/go-text/typesetting v0.1.1 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
github.com/stretchr/testify v1.8.1 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/tevino/abool v1.2.0 // indirect
github.com/yuin/goldmark v1.5.4 // indirect
golang.org/x/image v0.5.0 // indirect
golang.org/x/mobile v0.0.0-20221110043201-43a038452099 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
github.com/yuin/goldmark v1.7.1 // indirect
golang.org/x/image v0.15.0 // indirect
golang.org/x/mobile v0.0.0-20240404231514-09dbf07665ed // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 // indirect
honnef.co/go/js/dom v0.0.0-20231112215516-51f43a291193 // indirect
)

replace fyne.io/fyne/v2 => github.com/alexballas/fyne/v2 v2.3.2-patches2
//replace fyne.io/fyne/v2 => github.com/alexballas/fyne/v2 v2.3.2-patches2
Loading

0 comments on commit 17889b6

Please sign in to comment.