Merge pull request #54 from iloveicedgreentea/develop

Actual Jellyfin support and misc fixes

.github/workflows/docker-publish.yml

@@ -26,7 +26,7 @@ jobs:
         uses: docker/[email protected]
 
       - name: Log into registry ${{ env.REGISTRY }}
-        if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
+        # if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') || github.event_name == 'pull_request'}}
         uses: docker/[email protected]
         with:
           registry: ${{ env.REGISTRY }}
@@ -43,5 +43,5 @@ jobs:
         uses: docker/[email protected]
         with:
           context: .
-          push: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 as build
+FROM golang:1.22 as build
 
 WORKDIR /go/src/app
 COPY . .

Dockerfile.dev

@@ -0,0 +1,21 @@
+FROM golang:1.22 as build
+
+WORKDIR /go/src/app
+COPY . .
+RUN go mod download
+WORKDIR /go/src/app/cmd
+
+RUN CGO_ENABLED=0 go build -o /go/bin/app
+
+FROM alpine:20231219
+
+RUN apk add  supervisor
+COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY docker/watch.py /watch.py
+
+COPY --from=build /go/bin/app /
+COPY --from=build /go/src/app/web /web
+EXPOSE 9999
+
+# CMD ["/app"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

Makefile

@@ -5,10 +5,10 @@ build:
 test:
 	./test.sh
 docker-build:
-	docker buildx build --load --tag gowatchit-local .
+	docker buildx build --platform linux/amd64 --load --tag gowatchit-local . -f ./Dockerfile.dev
 docker-push:
 	docker buildx build --push --platform linux/amd64 --tag ghcr.io/iloveicedgreentea/gowatchit:test . 
 docker-run:
-	LOG_FILE=false LOG_LEVEL=debug docker-compose up
+	LOG_FILE=false LOG_LEVEL=debug docker-compose -f docker-compose-test.yml up
 run: build
 	LOG_FILE=false LOG_LEVEL=debug ./build/server

changelog.txt

@@ -40,5 +40,7 @@ Modify UUID filter to accept comma for multiple
 * fix cache on resume
 * various speedups
 * remove listen port config
-* improve search by using tmdb 
-* add author name to mqtt topic and logs
+* improve search by filtering tmdb 
+* add author name to mqtt topic and logs
+* add option to skip TMDB for jellyfin, seems to be necessary because their metadata is super unreliable
+* Implement start/stop support for jellyfin

cmd/main.go

@@ -76,7 +76,6 @@ func main() {
 	r.GET("/health", handlers.ProcessHealthcheckWebhookGin)
 
 	// Add plex webhook handler
-	// TODO: split out non plex specific stuff into a library
 	r.POST("/plexwebhook", func(c *gin.Context) {
 		handlers.ProcessWebhook(plexChan, c)
 	})
@@ -92,11 +91,11 @@ func main() {
 	r.POST("/save-config", api.SaveConfig)
 	// TODO: add generic webhook endpoint, maybe mqtt?
 
-	// TODO implement signal checking, error chan, etc
 	/*
 		###############################
 		block until workers get ready
 		############################## */
+	log.Info("Waiting for workers to be ready...")
 	<-plexReady
 	<-minidspReady
 	<-jfReady

docker-compose-test.yml

@@ -0,0 +1,14 @@
+version: '3.8' 
+
+services:
+  plex-webhook-automation:
+    platform: linux/amd64
+    image: gowatchit-local:latest
+    ports:
+      - '9999:9999' 
+    environment: 
+      SUPER_DEBUG: 'false'
+      LOG_LEVEL: 'debug'
+    volumes:
+      - ./docker/data:/data 
+      - ./web:/web

internal/common/webhooks.go

@@ -8,7 +8,6 @@ import (
 	"github.com/iloveicedgreentea/go-plex/models"
 )
 
-// TODO: test this if not already
 func DecodeWebhook(payload []string) (models.PlexWebhookPayload, int, error) {
 	var pwhPayload models.PlexWebhookPayload
 

internal/ezbeq/ezbeq.go

@@ -128,7 +128,6 @@ func (c *BeqClient) MuteCommand(status bool) error {
 func (c *BeqClient) MakeCommand(payload []byte) error {
 	for _, v := range c.DeviceInfo {
 		endpoint := fmt.Sprintf("/api/1/devices/%s", v.Name)
-		log.Debugf("ezbeq: Using endpoint %s", endpoint)
 		_, err := c.makeReq(endpoint, payload, http.MethodPatch)
 		if err != nil {
 			return err
@@ -171,7 +170,7 @@ func (c *BeqClient) makeReq(endpoint string, payload []byte, methodType string)
 	// log.Debugf("Using url %s", req.URL)
 	// log.Debugf("Headers from req %v", req.Header)
 	// simple retry
-	res, err := c.makeCallWithRetry(req, 5, endpoint)
+	res, err := c.makeCallWithRetry(req, 20, endpoint)
 
 	return res, err
 }
@@ -188,13 +187,15 @@ func (c *BeqClient) makeCallWithRetry(req *http.Request, maxRetries int, endpoin
 		res, err = c.HTTPClient.Do(req)
 		if err != nil {
 			log.Debugf("Error with request - Retrying %v", err)
+			time.Sleep(time.Second * 2)
 			continue
 		}
 		defer res.Body.Close()
 
 		resp, err = io.ReadAll(res.Body)
 		if err != nil {
 			log.Debugf("Reading body failed - Retrying %v", err)
+			time.Sleep(time.Second * 2)
 			continue
 		}
 
@@ -213,6 +214,7 @@ func (c *BeqClient) makeCallWithRetry(req *http.Request, maxRetries int, endpoin
 			log.Debug(string(resp), status)
 			log.Debug("Retrying request...")
 			err = fmt.Errorf("error in response: %v", res.Status)
+			time.Sleep(time.Second * 2)
 			continue
 		}
 	}
@@ -260,15 +262,37 @@ func (c *BeqClient) searchCatalog(m *models.SearchRequest) (models.BeqCatalog, e
 
 	// search through results and find match
 	for _, val := range payload {
-		log.Debugf("Beq results: Title: %v -- Codec %v, ID: %v", val.Title, val.AudioTypes, val.ID)
+		// if skipping TMDB, set the IDs to match
+		if config.GetBool("jellyfin.skiptmdb") {
+			if m.Title == "" {
+				return models.BeqCatalog{}, errors.New("title is blank, can't skip TMDB")
+			}
+			log.Debug("Skipping TMDB for search")
+			val.MovieDbID = m.TMDB
+			if !strings.EqualFold(val.Title, m.Title) {
+				log.Debugf("%s did not match with title %s", val.Title, m.Title)
+				continue
+			}
+			log.Debugf("%s matched with title %s", val.Title, m.Title)
+		}
+		log.Debugf("Beq results: Title: %v // Codec %v, ID: %v", val.Title, val.AudioTypes, val.ID)
 		// if we find a match, return it. Much easier to match on tmdb since plex provides it also
-		if val.MovieDbID == m.TMDB && val.Year == m.Year && val.AudioTypes[0] == m.Codec {
+		var audioMatch bool
+		// rationale here is some BEQ entries have multiple audio types in one entry
+		for _, v := range val.AudioTypes {
+			if strings.EqualFold(v, m.Codec) {
+				audioMatch = true
+				break
+			}
+		}
+		if val.MovieDbID == m.TMDB && val.Year == m.Year && audioMatch {
+			log.Debugf("%s matched with codecs %v, checking further", val.Title, val.AudioTypes)
 			// if it matches, check edition
 			if checkEdition(val, m.Edition) {
 				log.Infof("Found a match in catalog from author %s", val.Author)
 				return val, nil
 			} else {
-				log.Error("Found a match but editions did not match entry. Not loading")
+				log.Errorf("Found a potential match but editions did not match entry. Not loading")
 			}
 		}
 	}
@@ -299,9 +323,6 @@ func (c *BeqClient) LoadBeqProfile(m *models.SearchRequest) error {
 		return nil
 	}
 
-	if m.TMDB == "" {
-		return errors.New("tmdb is empty. Can't find a match")
-	}
 	log.Debugf("beq payload is %#v", m)
 
 	// if no devices provided, error
@@ -330,6 +351,37 @@ func (c *BeqClient) LoadBeqProfile(m *models.SearchRequest) error {
 					return err
 				}
 			}
+			// most metadata contains DD+5.1 or something but its actually DD+ Atmos, so try a few options
+		} else if m.Codec == "DD+Atmos5.1Maybe" {
+			m.Codec = "DD+ Atmos"
+			catalog, err = c.searchCatalog(m)
+			// else try DD+ 5.1
+			if err != nil {
+				m.Codec = "DD+ 5.1"
+				catalog, err = c.searchCatalog(m)
+				if err != nil {
+					m.Codec = "DD+"
+					catalog, err = c.searchCatalog(m)
+					if err != nil {
+						return err
+					}
+				}
+			}
+		} else if m.Codec == "DD+Atmos7.1Maybe" {
+			m.Codec = "DD+ Atmos"
+			catalog, err = c.searchCatalog(m)
+			// else try DD+ 7.1
+			if err != nil {
+				m.Codec = "DD+ 7.1"
+				catalog, err = c.searchCatalog(m)
+				if err != nil {
+					m.Codec = "DD+"
+					catalog, err = c.searchCatalog(m)
+					if err != nil {
+						return err
+					}
+				}
+			}
 		} else {
 			catalog, err = c.searchCatalog(m)
 			if err != nil {
@@ -382,8 +434,6 @@ func (c *BeqClient) LoadBeqProfile(m *models.SearchRequest) error {
 	// write payload to each device
 	for _, v := range m.Devices {
 		endpoint := fmt.Sprintf("/api/2/devices/%s", v)
-		log.Debugf("json payload %v", string(jsonPayload))
-		log.Debugf("using endpoint %s", endpoint)
 		_, err = c.makeReq(endpoint, jsonPayload, http.MethodPatch)
 		if err != nil {
 			log.Debugf("json payload %v", string(jsonPayload))

internal/ezbeq/ezbeq_test.go

@@ -1,7 +1,7 @@
 package ezbeq
 
 import (
-	// "strings"
+	"strings"
 	"fmt"
 	"testing"
 
@@ -670,6 +670,35 @@ func TestLoadProfile(t *testing.T) {
 			Devices:         []string{"master", "master2"},
 			Slots:           []int{1},
 		},
+		// DD+Atmos5.1Maybe //underwater
+		{
+			TMDB:            "443791",
+			Year:            2020,
+			Codec:           "DD+Atmos5.1Maybe",
+			SkipSearch:      false,
+			EntryID:         "",
+			MVAdjust:        0.0,
+			DryrunMode:      false,
+			PreferredAuthor: "none",
+			Edition:         "",
+			MediaType:       "movie",
+			Devices:         []string{"master", "master2"},
+			Slots:           []int{1},
+		},
+		{
+			TMDB:            "804095",
+			Year:            2022,
+			Codec:           "DD+Atmos7.1Maybe",
+			SkipSearch:      false,
+			EntryID:         "",
+			MVAdjust:        0.0,
+			DryrunMode:      false,
+			PreferredAuthor: "none",
+			Edition:         "",
+			MediaType:       "movie",
+			Devices:         []string{"master", "master2"},
+			Slots:           []int{1},
+		},
 	}
 
 	for _, tc := range tt {
@@ -682,3 +711,7 @@ func TestLoadProfile(t *testing.T) {
 	}
 
 }
+
+func TestTitleCom(t *testing.T) {
+	assert.True(t, strings.EqualFold("American Sniper", ""))
+}