Merge pull request #1 from geek1011/refactor-devices

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
- - "1.10"
+ - "1.13"
 
 script:
  - make clean

Makefile

@@ -9,8 +9,8 @@ clean:
 	rm -rfv build
 
 deps:
-	go get github.com/tcnksm/ghr
-	go get github.com/mholt/archiver/cmd/arc
+	GO111MODULE=on go install github.com/tcnksm/ghr
+	GO111MODULE=on go install github.com/mholt/archiver/cmd/arc
 
 test:
 	go test ./...

README.md

@@ -1,4 +1,10 @@
 # koboutils
-Short utilities to do stuff with Kobo eReaders.
+Utilities to do stuff with Kobo eReaders. Can be used as a library: godoc.org/github.com/geek1011/koboutils/v2/kobo.
 
-Also can be used as a library: godoc.org/github.com/geek1011/koboutils/kobo
+**Features:**
+- Full support for device codenames (class, family, secondary).
+- Device specs.
+- Upgrade checks.
+- Device detection.
+- Cover image resizing.
+- Firmware version and date extraction.

go.mod

@@ -1,5 +1,5 @@
-module github.com/geek1011/koboutils
+module github.com/geek1011/koboutils/v2
 
-go 1.12
+go 1.13
 
 require github.com/spf13/pflag v1.0.5

kobo-find/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/geek1011/koboutils/kobo"
+	"github.com/geek1011/koboutils/v2/kobo"
 	"github.com/spf13/pflag"
 )
 

kobo-info/main.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/geek1011/koboutils/kobo"
+	"github.com/geek1011/koboutils/v2/kobo"
 	"github.com/spf13/pflag"
 )
 
@@ -56,9 +56,11 @@ func main() {
 	}
 
 	if device, ok := kobo.DeviceByID(id); ok {
-		printkv("Device", device.Name)
+		printkv("Device", device.Name())
 		printkv("Device ID", id)
-		printkv("Hardware", device.Hardware)
+		printkv("Device Family", fmt.Sprintf("%s (%s)", device.Family(), device.CodeNames().Family()))
+		printkv("Codenames", device.CodeNames().String())
+		printkv("Hardware", device.Hardware().String())
 	} else {
 		printkv("Device", "unknown")
 		printkv("Device ID", id)
@@ -96,7 +98,7 @@ func printkv(key, value string) {
 		}
 		fmt.Printf(`    "%s": "%s"`, strings.Replace(strings.ToLower(key), " ", "_", -1), value)
 	} else {
-		fmt.Printf("%10s: %s\n", key, value)
+		fmt.Printf("%15s: %s\n", key, value)
 	}
 }