Merge pull request #120 from eschizoid/bugfix/library-job-hook-url

Fixed library job webhook url

cmd/library/retrieve.go

@@ -27,9 +27,8 @@ var RetrieveLibraryCmd = &cobra.Command{
 		defer getJobOutputOutput.Body.Close()
 		part, err := ioutil.ReadAll(getJobOutputOutput.Body)
 		ShowError(err)
-		var zipFileName = writeFile(part)
-		glacierService.Unzip(zipFileName)
-		glacierService.Cleanup([]string{zipFileName})
+		writeFile(part)
+		//glacierService.Cleanup([]string{fileName})
 		jsonString, _ := json.Marshal(getJobOutputOutput)
 		fmt.Println("\n" + string(jsonString))
 		close(shutdownCh)
@@ -38,15 +37,16 @@ var RetrieveLibraryCmd = &cobra.Command{
 
 func writeFile(part []byte) string {
 	var err error
-	var zipFile *os.File
+	var retrievedFile *os.File
 	if retrievalType == "InventoryRetrieval" {
-		zipFile, err = ioutil.TempFile(os.TempDir(), "inventory.*.json")
+		retrievedFile, err = ioutil.TempFile(os.TempDir(), "inventory.*.json")
 	} else if retrievalType == "ArchiveRetrieval" {
-		zipFile, err = ioutil.TempFile(os.TempDir(), "movie.*.zip")
+		retrievedFile, err = ioutil.TempFile(os.TempDir(), "movie.*.zip")
+		glacierService.Unzip(retrievedFile.Name())
 	}
 	ShowError(err)
-	zipFileName := zipFile.Name()
-	err = ioutil.WriteFile(zipFileName, part, 0644)
+	fileName := retrievedFile.Name()
+	err = ioutil.WriteFile(fileName, part, 0644)
 	ShowError(err)
-	return zipFileName
+	return fileName
 }

hooks/hooks.json

@@ -226,7 +226,7 @@
     "pass-environment-to-command": [
       {
         "source": "url",
-        "name": "t",
+        "name": "a",
         "envname": "RETRIEVAL_TYPE"
       },
       {
@@ -240,7 +240,7 @@
         "type": "value",
         "value": "{{getenv "SLACK_STATUS_TOKEN"}}",
         "parameter": {
-          "source": "payload",
+          "source": "url",
           "name": "token"
         }
       }

hooks/library.sh

@@ -27,7 +27,7 @@ case $# in
                 --filter "${FILTER}"
             ;;
          retrieve)
-            if [[ "${RETRIEVAL_TYPE}" = "FileRetrieval" ]]; then
+            if [[ "${RETRIEVAL_TYPE}" = "ArchiveRetrieval" ]]; then
                 /home/webhook/go/bin/flixctl library retrieve \
                     --job-id "${JOB_ID}" \
                     --file "/plex/movies/movie-$(date +%Y-%m-%d.%H:%M:%S).zip"

slack/library/message.go

@@ -3,6 +3,7 @@ package library
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"strconv"
 
 	"github.com/aws/aws-sdk-go/service/glacier"
@@ -12,6 +13,7 @@ import (
 
 func SendJobs(jobDescriptions []glacier.JobDescription, slackIncomingHookURL string) {
 	var attachments = make([]slack.Attachment, len(jobDescriptions))
+	token := os.Getenv("SLACK_MOVIES_SEARCH_TOKEN")
 	for _, jobDescription := range jobDescriptions {
 		attachmentFieldJobType := slack.AttachmentField{
 			Title: "*Job Type*",
@@ -50,9 +52,12 @@ func SendJobs(jobDescriptions []glacier.JobDescription, slackIncomingHookURL str
 			MarkdownIn: []string{"text", "fields"},
 			Actions: []slack.AttachmentAction{
 				{
-					Type:  "button",
-					Text:  "Start",
-					URL:   fmt.Sprintf("https://marianoflix.duckdns.org:9091/hooks/retrieve-job?t=%s&i%s", *jobDescription.Action, *jobDescription.JobId),
+					Type: "button",
+					Text: "Start",
+					URL: util.RetrieveJobHookURL +
+						"?a=" + *jobDescription.Action +
+						"&i=" + *jobDescription.JobId +
+						"&token=" + token,
 					Style: "default",
 					Confirm: &slack.ConfirmationField{
 						Title:       "Are you sure you want to start the job retrieval?",

slack/torrent/message.go

@@ -14,10 +14,6 @@ import (
 	"github.com/nlopes/slack"
 )
 
-const (
-	outgoingHookURL = "https://marianoflix.duckdns.org:9000/hooks/torrent-download"
-)
-
 func SendDownloadLinks(search *torrent.Search, slackIncomingHookURL string, directoryDir string, notification bool) {
 	var attachments = make([]slack.Attachment, len(search.Out))
 	token := os.Getenv("SLACK_MOVIES_SEARCH_TOKEN")
@@ -47,7 +43,7 @@ func SendDownloadLinks(search *torrent.Search, slackIncomingHookURL string, dire
 		attachment := slack.Attachment{
 			Color: "#C40203",
 			Title: torrentResult.Name,
-			TitleLink: outgoingHookURL +
+			TitleLink: util.TorrentDownloadHookURL +
 				"?directory=" + directoryDir +
 				"&name=" + url.QueryEscape(encodedName) +
 				"&notify=" + strconv.FormatBool(notification) +

slack/util.go

@@ -2,9 +2,15 @@ package slack
 
 import (
 	"fmt"
+	"os"
 	"time"
 )
 
+var (
+	TorrentDownloadHookURL = fmt.Sprintf("%s/%s", os.Getenv("HOOKS_URL"), "torrent-download")
+	RetrieveJobHookURL     = fmt.Sprintf("%s/%s", os.Getenv("HOOKS_URL"), "retrieve-job")
+)
+
 func GetTimeStamp() int64 {
 	location, err := time.LoadLocation("America/Chicago")
 	if err != nil {