Merge pull request 'changed namespace' (#3) from aledjones-patch-2 into main

Reviewed-on: #3

.github/workflows/go.yaml

@@ -0,0 +1,40 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: ["darwin","linux","windows"]
+        arch: ["amd64","arm64"]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.19
+
+      - name: Install dependencies
+        run: |
+          go get .
+
+      - name: Build
+        run: GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o spotigram_${{ matrix.os }}_${{ matrix.arch }} -v main.go
+      
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          name: spotigram_${{ matrix.os }}_${{ matrix.arch }}
+          path: spotigram_${{ matrix.os }}_${{ matrix.arch }}
+          retention-days: 90

.gitignore

@@ -1,2 +1,3 @@
 bin/
-.idea
+.idea
+.vscode/launch.json

README.md

@@ -1,7 +1,9 @@
 Spotigram
 =========
 
-_Wenns' gut werden muss_
+_Wenns' gut werden muss_  
+
+[![build status](https://git.jonasmoeller.de/aledjones/spotigram/actions/workflows/go.yaml/badge.svg)](https://git.jonasmoeller.de/aledjones/spotigram)
 
 ## Was ist Spotigram?
 

cmd/telegramBot.go

@@ -24,14 +24,15 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"log"
+	"strings"
+
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/zmb3/spotify/v2"
 	spotifyauth "github.com/zmb3/spotify/v2/auth"
 	"golang.org/x/oauth2"
-	"log"
-	"strings"
 )
 
 // telegramBotCmd represents the telegramBot command
@@ -104,30 +105,70 @@ It is not planned to extend this in the future.`,
 					cobra.CheckErr(err)
 
 					if results != nil {
-						track := results.Tracks.Tracks[0]
+
 						playlist, err := client.GetPlaylist(ctx, spotify.ID(viper.GetString("spotify_playlist_id")))
 						cobra.CheckErr(err)
 
-						addTrackResponse, err := client.AddTracksToPlaylist(ctx,
+						tracks, err := client.GetPlaylistItems(ctx, playlist.ID)
-							playlist.ID,
-							results.Tracks.Tracks[0].ID)
 						cobra.CheckErr(err)
 
-						msg.Text = fmt.Sprintf("Ich habe den Titel <pre>%s</pre> von <pre>%s</pre> zur Playlist <pre>%s</pre> hinzugefügt.",
+						trackIDs := make([]spotify.ID, 0, len(tracks.Items))
-							track.Name,
-							track.Artists[0].Name,
-							playlist.Name,
-						)
-						msg.ParseMode = "HTML"
-						_, err = bot.Send(msg)
-						cobra.CheckErr(err)
 
-						fmt.Printf("New track added to playlist: %s by %s\nsnapshot: %s\n\n",
+						for page := 1; ; page++ {
-							track.Name,
-							track.Artists[0].Name,
-							addTrackResponse)
 
+							for _, track := range tracks.Items {
+								trackIDs = append(trackIDs, track.Track.Track.ID)
+							}
+
+							err = client.NextPage(ctx, tracks)
+							if err == spotify.ErrNoMorePages {
+								break
+							}
+							if err != nil {
+								cobra.CheckErr(err)
+							}
+						}
+
+						if contains(trackIDs, results.Tracks.Tracks[0].ID) {
+							track := results.Tracks.Tracks[0]
+
+							msg.Text = fmt.Sprintf("⛔ Ooops, dieser Titel ist schon in der Playlist!\n Ich habe den Titel <pre>%s</pre> von <pre>%s</pre> nicht ERNEUT zur Playlist <pre>%s</pre> hinzugefügt.",
+								track.Name,
+								track.Artists[0].Name,
+								playlist.Name,
+							)
+							msg.ParseMode = "HTML"
+							_, err = bot.Send(msg)
+							cobra.CheckErr(err)
+
+							fmt.Printf("Declined adding duplicate track: %s by %s",
+								track.Name,
+								track.Artists[0].Name)
+
+						} else {
+							track := results.Tracks.Tracks[0]
+
+							addTrackResponse, err := client.AddTracksToPlaylist(ctx,
+								playlist.ID,
+								results.Tracks.Tracks[0].ID)
+							cobra.CheckErr(err)
+
+							msg.Text = fmt.Sprintf("Ich habe den Titel <pre>%s</pre> von <pre>%s</pre> zur Playlist <pre>%s</pre> hinzugefügt.",
+								track.Name,
+								track.Artists[0].Name,
+								playlist.Name,
+							)
+							msg.ParseMode = "HTML"
+							_, err = bot.Send(msg)
+							cobra.CheckErr(err)
+
+							fmt.Printf("New track added to playlist: %s by %s\nsnapshot: %s\n\n",
+								track.Name,
+								track.Artists[0].Name,
+								addTrackResponse)
+						}
 					}
+
 				case "rofl":
 					msg.Text = "🤣"
 					_, err = bot.Send(msg)
@@ -156,3 +197,12 @@ func init() {
 	// is called directly, e.g.:
 	// telegramBotCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
+
+func contains(s []spotify.ID, e spotify.ID) bool {
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}

go.mod

@@ -1,4 +1,4 @@
-module github.com/aledjones/spotigram
+module git.jonasmoeller.de/aledjones/spotigram
 
 go 1.19
 

main.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2023 Jonas Möller <mail@jonasmoeller.de>
+Copyright © 2024 Jonas Möller <mail@jonasmoeller.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 package main
 
-import "github.com/aledjones/spotigram/cmd"
+import "git.jonasmoeller.de/aledjones/spotigram/cmd"
 
 func main() {
 	cmd.Execute()