database-and-api merge latest dev changes and misc fixes (#252)

* Add note that M3U can be a file path.

* Fix some spelling

* Update README.md

* Update README.md

* Note about pre-release status.

* Update README.md

* Clarify which sections are required

* Update README.md

* Update README.md

* Update routes.go

Remove the  "-bsf:v", "h264_mp4toannexb" to fix HEVC streams.

* Update to address minor bug in ffmpeg key handling

* Typo

* Minor fixes for breaking changes in go.schedulesdirect

* More fixes for SD

* Spelling fixes

* Update README.md

Specifically state not to change the magic provider names.

* Note on key fields for multiple instances

* Update .circleci/config.yml to use dep so that we stop having build breakage

* Note about IPTV-EPG field names

They don't make sense, but cest la vie.

* Update README.md

* Update README.md

* Fix XMLTV date parsing because Vaders doesnt know how to write dates properly

* Update README.md

Add a reference to specific version.

* Update Vaders URL

* Update README.md

* bump version to 1.1.0.5

* Add a log line in a situation that might indicate a missing config file.

* Add a couple more targets

* Build using the same mechanism as the makefile so the docker build has a version number
Remove redundant build

* Update README.md

* Update tnt.go

* hdhr device ids are alpha numeric

* remove HDHomerun prefix from friendly name

* Removed references to the late, lamented Vader Streams.

* set content type for ffmpeg stream

* remove unused ffmpeg option

-tune is an encoding option. when passing -codec copy,
no encoding is happening so that option is not used.

since there is no encoding or decoding happening, it is
incorrect to state that ffmpeg is transcoding.

* replace dep with go mod

* update dependencies

* fix test failure

* GOPATH not required anymore

* fix version number configuration to be compatible with go modules

* Bump version number to 1.1.0.6

* updated go.mod, go.sum

* Use standard crossbuild for docker build instead of spinning up a docker build container.

* Support multicast streams through udpxy in the custom provider (#238)

* m3uplus parser: support UDP streams.

* Allow customers using the custom provider to use udpxy as a multicast proxy.

* fix squirrel imports to github.com source instead of gopkg.in

gopkg was previously used to lock the version, this is now done correctly in Go 1.6 by cloning the Github default branch

* replace satori/go.uuid with gofrs/uuid

satori/go.uuid is no longer maintained

* xmltv.go: restore a small linter that was rebased away

* update go module deps

.circleci/config.yml

@@ -34,52 +34,14 @@ jobs:
 
   docker_hub_master:
     docker:
-    - image: circleci/golang:1.10
-    working_directory: /go/src/github.com/tellytv/telly
+      - image: circleci/golang:1
 
     steps:
-    - checkout
-    - setup_remote_docker
-    - attach_workspace:
-        at: .
-    - run: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-    - run: ln -s .build/linux-amd64/telly telly
-    - run: make docker
-    - run: docker images
-    - run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-    - run: make docker-publish
-
-  docker_hub_release_tags:
-    docker:
-    - image: circleci/golang:1.10
-    working_directory: /go/src/github.com/tellytv/telly
-
-    steps:
-    - checkout
-    - setup_remote_docker
-    - run: mkdir -v -p ${HOME}/bin
-    - run: curl -L 'https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2' | tar xvjf - --strip-components 3 -C ${HOME}/bin
-    - run: echo 'export PATH=${HOME}/bin:${PATH}' >> ${BASH_ENV}
-    - attach_workspace:
-        at: .
-    - run: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-    - run: make promu
-    - run: make dep
-    - run: promu crossbuild tarballs
-    - run: promu checksum .tarballs
-    - run: promu release .tarballs
-    - store_artifacts:
-        path: .tarballs
-        destination: releases
-    - run: ln -s .build/linux-amd64/telly telly
-    - run: make docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
-    - run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-    # - run: |
-    #     if [[ "$CIRCLE_TAG" =~ ^v[0-9]+(\.[0-9]+){2}$ ]]; then
-    #       make docker-tag-latest DOCKER_IMAGE_TAG="$CIRCLE_TAG"
-
-    #     fi
-    - run: make docker-publish
+      - checkout
+      # - run: go get -u github.com/alecthomas/gometalinter
+      # - run: gometalinter --install
+      - run: go test -v ./...
+      # - run: gometalinter --config=.gometalinter.json ./...
 
 workflows:
   version: 2

.gometalinter.json

@@ -28,7 +28,6 @@
   "Exclude": [
     "^vendor\/",
     ".*-packr.go.*",
-    ".*squirrel.v1.*",
     ".*tableName is unused.*",
     "error return value not checked .*c.AbortWithError.*"
   ],

.promu.yml

@@ -5,11 +5,11 @@ go:
 build:
   flags: -a -tags 'netgo json1'
   ldflags: |
-    -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
-    -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
-    -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
-    -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-    -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+    -X github.com/prometheus/common/version.Version={{.Version}}
+    -X github.com/prometheus/common/version.Revision={{.Revision}}
+    -X github.com/prometheus/common/version.Branch={{.Branch}}
+    -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+    -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 tarball:
   files:
     - LICENSE

Dockerfile

@@ -1,12 +1,6 @@
-FROM jrottenberg/ffmpeg:4.0-alpine
+FROM scratch
+COPY .build/linux-amd64/telly ./app
+EXPOSE 6077
+ENTRYPOINT ["./app"]
 
-RUN apk update && apk upgrade && apk add --update --no-cache ca-certificates musl-dev
 
-COPY .build/linux-amd64/telly /bin/telly
-
-USER       nobody
-EXPOSE     6077
-VOLUME     [ "/telly" ]
-WORKDIR    /telly
-ENTRYPOINT [ "/bin/telly" ]
-CMD        [ "--database.file=/telly/telly.db" ]