Add skipping support, update dependencies

Author: Vilsol

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine AS builder
+FROM golang:1.15-alpine AS builder
 
 RUN apk add --no-cache git build-base
 

README.md

@@ -17,6 +17,7 @@ Flags:
       --log string           The log level to output (default "info")
       --nice                 Whether to lower the priority of ffmpeg process (default true)
       --stderr               Whether to output ffmpeg stderr stream
+      --tg-admin-id int      Telegram Admin User ID
       --tg-bot-key string    Telegram Bot API Key
       --tg-chat-id string    Telegram Bot Chat ID
 ```

cmd/root.go

@@ -76,6 +76,9 @@ var rootCmd = &cobra.Command{
 			log.Error("Specified paths did not match any files")
 		}
 
+		skip := make(chan bool, 1)
+		notifications.SetSkipChannel(skip)
+
 		for _, fileName := range fileList {
 			if terminated {
 				return
@@ -103,7 +106,7 @@ var rootCmd = &cobra.Command{
 				continue
 			}
 
-			killed, lastReport := transcoder.TranscodeFile(fileName, tempFileName, metadata)
+			killed, lastReport, skipped := transcoder.TranscodeFile(fileName, tempFileName, metadata, skip)
 
 			if terminated {
 				notifications.NotifyEnd(nil, nil, models.ResultError)
@@ -116,7 +119,7 @@ var rootCmd = &cobra.Command{
 
 			updateProcessedFile(tempFileName, processedFileName)
 
-			if killed {
+			if killed && !skipped {
 				// Assume corrupted output file
 				err := os.Remove(tempFileName)
 
@@ -141,13 +144,30 @@ var rootCmd = &cobra.Command{
 				continue
 			}
 
+			if skipped {
+				updateProcessedFile(fileName, processedFileName)
+
+				// Transcoded file was skipped
+				err := os.Remove(tempFileName)
+
+				if err != nil && !os.IsNotExist(err) {
+					log.Errorf("Error deleting file %s: %s", tempFileName, err)
+					continue
+				}
+
+				log.Infof("Skipped, kept original: %s", fileName)
+				notifications.NotifyEnd(nil, lastReport, models.ResultSkipped)
+
+				continue
+			}
+
 			resultMetadata := transcoder.ReadFileMetadata(tempFileName)
 
 			if viper.GetBool("keep-old") && resultMetadata.Format.SizeInt() > metadata.Format.SizeInt() {
 				// Transcoded file is bigger than original
 				err := os.Remove(tempFileName)
 
-				if err != nil {
+				if err != nil && !os.IsNotExist(err) {
 					log.Errorf("Error deleting file %s: %s", tempFileName, err)
 					continue
 				}
@@ -221,6 +241,7 @@ func init() {
 
 	rootCmd.PersistentFlags().String("tg-bot-key", "", "Telegram Bot API Key")
 	rootCmd.PersistentFlags().String("tg-chat-id", "", "Telegram Bot Chat ID")
+	rootCmd.PersistentFlags().Int("tg-admin-id", 0, "Telegram Admin User ID")
 
 	_ = viper.BindPFlag("flags", rootCmd.PersistentFlags().Lookup("flags"))
 	_ = viper.BindPFlag("extensions", rootCmd.PersistentFlags().Lookup("extensions"))
@@ -232,6 +253,7 @@ func init() {
 
 	_ = viper.BindPFlag("tg-bot-key", rootCmd.PersistentFlags().Lookup("tg-bot-key"))
 	_ = viper.BindPFlag("tg-chat-id", rootCmd.PersistentFlags().Lookup("tg-chat-id"))
+	_ = viper.BindPFlag("tg-admin-id", rootCmd.PersistentFlags().Lookup("tg-admin-id"))
 }
 
 func shouldTranscode(fileName string) bool {
@@ -322,6 +344,10 @@ func updateProcessedFile(fileName string, processedFileName string) {
 
 	originalStat, err := os.Stat(fileName)
 
+	if os.IsNotExist(err) {
+		return
+	}
+
 	if err != nil {
 		log.Errorf("Error reading file %s: %s", fileName, err)
 		return

go.mod

@@ -1,11 +1,11 @@
 module github.com/Vilsol/transcoder-go
 
-go 1.14
+go 1.15
 
 require (
 	github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible
-	github.com/sirupsen/logrus v1.2.0
-	github.com/spf13/cobra v0.0.6
-	github.com/spf13/viper v1.6.2
+	github.com/sirupsen/logrus v1.7.0
+	github.com/spf13/cobra v1.1.1
+	github.com/spf13/viper v1.7.1
 	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
 )

go.sum

@@ -48,6 +48,7 @@ const (
 	ResultKeepOriginal = Result("Kept original")
 	ResultReplaced     = Result("Replaced with new")
 	ResultError        = Result("Error")
+	ResultSkipped      = Result("Skipped, kept original")
 )
 
 func (format Format) SizeInt() int64 {

models/transcode.go

@@ -20,6 +20,8 @@ var end []End
 var started time.Time
 var currentFileMetadata *models.FileMetadata
 
+var skipChan chan bool
+
 func InitializeNotifications() {
 	for _, f := range initialize {
 		f()
@@ -102,3 +104,7 @@ func generateUpdatedNotificationData(report *models.ProgressReport) *models.Noti
 
 	return &data
 }
+
+func SetSkipChannel(skip chan bool) {
+	skipChan = skip
+}

notifications/notifications.go

@@ -13,6 +13,12 @@ import (
 
 var tgBot *tgbotapi.BotAPI
 
+var messageKeyboard = tgbotapi.NewInlineKeyboardMarkup(
+	tgbotapi.NewInlineKeyboardRow(
+		tgbotapi.NewInlineKeyboardButtonData("Skip", "skip"),
+	),
+)
+
 func init() {
 	initialize = append(initialize, func() {
 		if viper.GetString("tg-bot-key") != "" && viper.GetString("tg-chat-id") != "" {
@@ -21,6 +27,7 @@ func init() {
 
 			if err != nil {
 				log.Fatalf("Error initializing telegram bot: %s", err)
+				return
 			}
 
 			log.Printf("Telegram connected: %s", tgBot.Self.UserName)
@@ -29,25 +36,53 @@ func init() {
 
 			lastMessage := int64(0)
 
-			chatIdStr := viper.GetString("tg-chat-id")
+			chatIDStr := viper.GetString("tg-chat-id")
 
-			chatId, err := strconv.ParseInt(chatIdStr, 10, 64)
+			chatID, err := strconv.ParseInt(chatIDStr, 10, 64)
 
 			if err != nil {
 				chat, err := tgBot.GetChat(tgbotapi.ChatConfig{
-					SuperGroupUsername: chatIdStr,
+					SuperGroupUsername: chatIDStr,
 				})
 
 				if err != nil {
-					log.Fatalf("Chat not found: %s", chatIdStr)
+					log.Fatalf("Chat not found: %s", chatIDStr)
+					return
 				}
 
-				chatId = chat.ID
+				chatID = chat.ID
+			}
+
+			if viper.GetInt("tg-admin-id") != 0 {
+				go func() {
+					u := tgbotapi.NewUpdate(0)
+					u.Timeout = 60
+
+					updates, err := tgBot.GetUpdatesChan(u)
+
+					if err != nil {
+						log.Fatalf("Error listening to telegram messages: %s", err)
+						return
+					}
+
+					for update := range updates {
+						query := update.CallbackQuery
+						if query == nil {
+							continue
+						}
+
+						if viper.GetInt("tg-admin-id") == query.From.ID {
+							log.WithField("user", query.From.UserName).Infof("Skip button pressed in telegram")
+							skipChan <- true
+						}
+					}
+				}()
 			}
 
 			start = append(start, func(data *models.NotificationData) {
-				message := tgbotapi.NewMessage(chatId, generateTelegramMessageText(data, nil))
+				message := tgbotapi.NewMessage(chatID, generateTelegramMessageText(data, nil))
 				message.ParseMode = tgbotapi.ModeMarkdown
+				message.ReplyMarkup = messageKeyboard
 				send, err := tgBot.Send(message)
 
 				if err != nil {
@@ -66,8 +101,9 @@ func init() {
 				}
 
 				if currentMessage != nil {
-					message := tgbotapi.NewEditMessageText(chatId, currentMessage.MessageID, generateTelegramMessageText(data, nil))
+					message := tgbotapi.NewEditMessageText(chatID, currentMessage.MessageID, generateTelegramMessageText(data, nil))
 					message.ParseMode = tgbotapi.ModeMarkdown
+					message.ReplyMarkup = &messageKeyboard
 					_, err := tgBot.Send(message)
 
 					if err != nil {
@@ -80,8 +116,9 @@ func init() {
 
 			end = append(end, func(data *models.NotificationData, result models.Result) {
 				if currentMessage != nil {
-					message := tgbotapi.NewEditMessageText(chatId, currentMessage.MessageID, generateTelegramMessageText(data, &result))
+					message := tgbotapi.NewEditMessageText(chatID, currentMessage.MessageID, generateTelegramMessageText(data, &result))
 					message.ParseMode = tgbotapi.ModeMarkdown
+					message.ReplyMarkup = nil
 					_, err := tgBot.Send(message)
 
 					if err != nil {
@@ -124,7 +161,7 @@ func generateTelegramMessageText(data *models.NotificationData, result *models.R
 	eta := time.Duration(0)
 	if complete > 0 {
 		expected = utils.BytesHumanReadable(int64(float64(data.CurrentSize*100) / complete))
-		eta = time.Duration((float64(time.Now().Sub(data.Started)) / complete) * (100 - complete))
+		eta = time.Duration((float64(time.Since(data.Started)) / complete) * (100 - complete))
 	}
 
 	return fmt.Sprintf(

notifications/telegram.go

@@ -70,7 +70,7 @@ func BuildFlags(fileName string, tempFileName string, metadata *models.FileMetad
 	return finalFlags
 }
 
-func TranscodeFile(fileName string, tempFileName string, metadata *models.FileMetadata) (bool, *models.ProgressReport) {
+func TranscodeFile(fileName string, tempFileName string, metadata *models.FileMetadata, skip chan bool) (bool, *models.ProgressReport, bool) {
 	flags := BuildFlags(fileName, tempFileName, metadata)
 
 	notifications.NotifyStart(metadata)
@@ -112,6 +112,12 @@ func TranscodeFile(fileName string, tempFileName string, metadata *models.FileMe
 
 	go ReadOut(outPipe, fileName, metadata, stopTranscoder)
 
+	skipping := false
+	go func() {
+		skipping = <-skip
+		stopTranscoder <- true
+	}()
+
 	err = c.Wait()
 
 	if err != nil {
@@ -120,7 +126,7 @@ func TranscodeFile(fileName string, tempFileName string, metadata *models.FileMe
 
 	stopTranscoder <- false
 
-	return <-done, lastReport
+	return <-done, lastReport, skipping
 }
 
 func ReadOut(pipe io.ReadCloser, filename string, metadata *models.FileMetadata, stopTranscoder chan bool) {
@@ -194,7 +200,7 @@ func ReadError(pipe io.ReadCloser) {
 	}
 }
 
-var flatParseRegex = regexp.MustCompile("\\s*(-?[0-9.]+).*")
+var flatParseRegex = regexp.MustCompile(`\s*(-?[0-9.]+).*`)
 
 func OutputToReport(lines []string) *models.ProgressReport {
 	report := models.ProgressReport{}