Merge pull request #43 from CameronRP/add-dbus-service

Updated moduel version to 3

audiofilelibrary/audiofilelibrary.go

@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/TheCacophonyProject/audiobait/playlist"
+	"github.com/TheCacophonyProject/audiobait/v3/playlist"
 )
 
 // AudioFileLibrary is a structure to hold info on the files in the audio directory.

cmd/audiobait/downloader.go

@@ -27,8 +27,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/TheCacophonyProject/audiobait/audiofilelibrary"
-	"github.com/TheCacophonyProject/audiobait/playlist"
+	"github.com/TheCacophonyProject/audiobait/v3/audiofilelibrary"
+	"github.com/TheCacophonyProject/audiobait/v3/playlist"
 	"github.com/TheCacophonyProject/go-api"
 	"github.com/TheCacophonyProject/modemd/connrequester"
 )

cmd/audiobait/main.go

@@ -27,8 +27,8 @@ import (
 
 	arg "github.com/alexflint/go-arg"
 
-	"github.com/TheCacophonyProject/audiobait/audiofilelibrary"
-	"github.com/TheCacophonyProject/audiobait/playlist"
+	"github.com/TheCacophonyProject/audiobait/v3/audiofilelibrary"
+	"github.com/TheCacophonyProject/audiobait/v3/playlist"
 	goconfig "github.com/TheCacophonyProject/go-config"
 )
 

cmd/audiobait/player.go

@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/TheCacophonyProject/audiobait/audiofilelibrary"
+	"github.com/TheCacophonyProject/audiobait/v3/audiofilelibrary"
 	"github.com/TheCacophonyProject/event-reporter/eventclient"
 )
 

cmd/audiobait/player_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TheCacophonyProject/audiobait/audiofilelibrary"
+	"github.com/TheCacophonyProject/audiobait/v3/audiofilelibrary"
 	"github.com/TheCacophonyProject/event-reporter/eventclient"
 	"github.com/stretchr/testify/assert"
 )

go.mod

@@ -1,4 +1,4 @@
-module github.com/TheCacophonyProject/audiobait
+module github.com/TheCacophonyProject/audiobait/v3
 
 go 1.12
 

playlist/player.go

@@ -22,7 +22,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/TheCacophonyProject/audiobait/audiobaitclient"
+	"github.com/TheCacophonyProject/audiobait/v3/audiobaitclient"
 	"github.com/TheCacophonyProject/event-reporter/eventclient"
 	"github.com/TheCacophonyProject/window"
 )

playlist/schedule_test.go

@@ -19,6 +19,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 package playlist
 
 import (
+	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -114,5 +115,9 @@ func TestGetReferenceSounds(t *testing.T) {
 		},
 		AllSounds: []int{1, 2, 3, 212, 215},
 	}
-	assert.Equal(t, []int{212, 215}, scheduleNoRandom.GetReferencedSounds())
+	expected := []int{215, 212}
+	actual := scheduleNoRandom.GetReferencedSounds()
+	sort.Ints(expected)
+	sort.Ints(actual)
+	assert.Equal(t, expected, actual)
 }