From 03acf541dc6771d5188a367a8d6d33b0f0d73750 Mon Sep 17 00:00:00 2001 From: Rohit Amarnath Date: Mon, 13 Jan 2020 11:36:33 -0500 Subject: [PATCH 1/3] fix extra group title in csv header --- writer/csv.go | 1 - 1 file changed, 1 deletion(-) diff --git a/writer/csv.go b/writer/csv.go index e245d2c..df3403a 100644 --- a/writer/csv.go +++ b/writer/csv.go @@ -9,7 +9,6 @@ import ( var csvHeaders = []string{ "tvg-id", "group-title", - "group-title", "tvg-name", "duration", "tvg-logo", From de28e79562632cf0e9835b794a9526d172f90dfe Mon Sep 17 00:00:00 2001 From: Rohit Amarnath Date: Mon, 13 Jan 2020 11:37:37 -0500 Subject: [PATCH 2/3] add CUID based on hash of Uri --- writer/m3u.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/writer/m3u.go b/writer/m3u.go index fb67b7a..6e6e6ef 100644 --- a/writer/m3u.go +++ b/writer/m3u.go @@ -5,6 +5,8 @@ import ( "io" "strconv" "strings" + "crypto/md5" + "encoding/hex" ) func writeM3U(w io.Writer, streams []*m3u.Stream) { @@ -22,6 +24,12 @@ func writeM3U(w io.Writer, streams []*m3u.Stream) { } } +func GetMD5Hash(text string) string { + hasher := md5.New() + hasher.Write([]byte(text)) + return hex.EncodeToString(hasher.Sum(nil)) +} + func getStreamExtinf(stream *m3u.Stream) []byte { b := &strings.Builder{} b.WriteString("\n") @@ -32,6 +40,7 @@ func getStreamExtinf(stream *m3u.Stream) []byte { writeKV(b, "tvg-chno", stream.ChNo) } + writeKV(b, "CUID", GetMD5Hash(stream.Uri)) writeKV(b, "tvg-id", stream.Id) writeKV(b, "tvg-name", stream.Name) writeKV(b, "group-title", stream.Group) From 1de5c0599b4dad2154e6a41de1716a8e38b92e5f Mon Sep 17 00:00:00 2001 From: Rohit Amarnath Date: Mon, 13 Jan 2020 12:43:10 -0500 Subject: [PATCH 3/3] gofmt cleanup --- writer/m3u.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/writer/m3u.go b/writer/m3u.go index 6e6e6ef..9f8e1fd 100644 --- a/writer/m3u.go +++ b/writer/m3u.go @@ -1,12 +1,12 @@ package writer import ( + "crypto/md5" + "encoding/hex" "github.com/hoshsadiq/m3ufilter/m3u" "io" "strconv" "strings" - "crypto/md5" - "encoding/hex" ) func writeM3U(w io.Writer, streams []*m3u.Stream) { @@ -25,9 +25,9 @@ func writeM3U(w io.Writer, streams []*m3u.Stream) { } func GetMD5Hash(text string) string { - hasher := md5.New() - hasher.Write([]byte(text)) - return hex.EncodeToString(hasher.Sum(nil)) + hasher := md5.New() + hasher.Write([]byte(text)) + return hex.EncodeToString(hasher.Sum(nil)) } func getStreamExtinf(stream *m3u.Stream) []byte {