From b777bfd3949d2e670563ada25a51cabb421e4391 Mon Sep 17 00:00:00 2001 From: papaschloss <11808509+papaschloss@users.noreply.github.com> Date: Sun, 18 Nov 2018 18:53:55 -0500 Subject: [PATCH 1/6] allow non-integer channel numbers for OTA tuners that use non-integer channels (ex. "2.1") --- plex.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plex.go b/plex.go index fbe1d30..1b376b2 100644 --- a/plex.go +++ b/plex.go @@ -76,7 +76,7 @@ func (p *plexHeadend) lineupHandler(w http.ResponseWriter, r *http.Request) { for _, channel := range p.tvhGetChannels() { if p.tag == "" || sliceContains(channel.Tags, p.tag) { data = append(data, - lineupResponse{fmt.Sprintf("%d", channel.Number), channel.Name, channel.URL}) + lineupResponse{fmt.Sprintf("%s", channel.Number), channel.Name, channel.URL}) } } json.NewEncoder(w).Encode(data) From 427bdd7e823a81edd509583f1640790aa16d07fc Mon Sep 17 00:00:00 2001 From: papaschloss <11808509+papaschloss@users.noreply.github.com> Date: Sun, 18 Nov 2018 18:55:00 -0500 Subject: [PATCH 2/6] Update tvheadenv.go --- tvheadenv.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tvheadenv.go b/tvheadenv.go index 68c92c4..7042ef1 100644 --- a/tvheadenv.go +++ b/tvheadenv.go @@ -39,7 +39,7 @@ type apiChannelsResponse struct { type apiChannel struct { UUID string `json:"uuid"` Name string `json:"name"` - Number int `json:"number"` + Number string `json:"number"` Tags []string `json:"tags"` URL string `json:"url"` } From 103933690dff132546155ef04c86873f91c03103 Mon Sep 17 00:00:00 2001 From: papaschloss <11808509+papaschloss@users.noreply.github.com> Date: Sat, 19 Jan 2019 11:19:12 -0500 Subject: [PATCH 3/6] Update README.md --- README.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 4bba3a9..a1efa5c 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,18 @@ # plexheadend -[![GoDoc](https://godoc.org/github.com/wrboyce/plexheadend?status.svg)](https://godoc.org/github.com/wrboyce/plexheadend) -[![Go Report Card](https://goreportcard.com/badge/github.com/wrboyce/plexheadend)](https://goreportcard.com/report/github.com/wrboyce/plexheadend) -[![CircleCI](https://circleci.com/gh/wrboyce/plexheadend.png?style=shield)](https://circleci.com/gh/wrboyce/plexheadend) - Proxy requests between PlexDVR and TVHeadend -## Installation - -### Binary Release +This fixes an issue in github.com/wrboyce/plexheadend where OTA channels (like "2.1") won't work with plexheadend. -Download the latest release from the [downloads page](https://github.com/wrboyce/plexheadend/releases). +## Installation ### Build from Source -Download and build the project and its dependencies with the standard Go tooling, `go get github.com/wrboyce/plexheadend`. +Download and build the project and its dependencies with the standard Go tooling, `go get github.com/papaschloss/plexheadend`. ### Docker Container -There is also a Docker container made available for use at `wrboyce/plexheadend`. +There is also a Docker container made available for use at `papaschloss/plexheadend`. ## Usage @@ -69,7 +63,7 @@ services: restart: unless-stopped plexheadend: - image: wrboyce/plexheadend + image: papaschloss/plexheadend container_name: plexheadend environment: - PLEXHEADEND_TVH_HOST=tvheadend @@ -86,4 +80,4 @@ services: - 32400:32400 - 32400:32400/udp restart: unless-stopped -``` \ No newline at end of file +``` From 68e0030c8c678b010e9df6f1e3e9b748c9fa3ab5 Mon Sep 17 00:00:00 2001 From: papaschloss <11808509+papaschloss@users.noreply.github.com> Date: Sat, 19 Jan 2019 11:24:45 -0500 Subject: [PATCH 4/6] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b09b3d..a3eac04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.9.2 -ADD *.go /go/src/github.com/wrboyce/plexheadend/ -RUN go get -v github.com/wrboyce/plexheadend +ADD *.go /go/src/github.com/papaschloss/plexheadend/ +RUN go get -v github.com/papaschloss/plexheadend CMD plexheadend From a28c866929c6cd80397d1961661916c64d1e02c4 Mon Sep 17 00:00:00 2001 From: papaschloss <11808509+papaschloss@users.noreply.github.com> Date: Sat, 19 Jan 2019 11:25:37 -0500 Subject: [PATCH 5/6] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4cee60..61389ac 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -USERNAME ?= wrboyce +USERNAME ?= papaschloss PROJECT ?= plexheadend EXECUTABLE ?= plexheadend DOCKER_IMAGE ?= $(USERNAME)/$(PROJECT) From 8e8b845b8b2468bf5c5ab99847a667095aedc666 Mon Sep 17 00:00:00 2001 From: papaschloss <11808509+papaschloss@users.noreply.github.com> Date: Sat, 19 Jan 2019 11:26:19 -0500 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6381c7..e387458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +* fixed issue w/ non-integer channels + ## v1.0.1 - 2017-11-29 * Update golang to 1.9.3 [Will Boyce]