Merge pull request #3 from opengapps:update-deps-gapps

Update deps, switch to own gapps package

.golangci.yml

@@ -20,8 +20,6 @@ output:
 linters-settings:
   govet:
     check-shadowing: true
-  golint:
-    min-confidence: 0
   dupl:
     threshold: 100
   goconst:
@@ -31,7 +29,7 @@ linters-settings:
 linters:
   disable-all: true
   enable:
-    - golint
+    - revive
     - govet
     - errcheck
     - deadcode
@@ -51,7 +49,7 @@ issues:
     # _ instead of err checks
     - G104
     # for "public interface + private struct implementation" cases only!
-    - exported func * returns unexported type *, which can be annoying to use
+    - exported func .* returns unexported type .*, which can be annoying to use
     # can be removed in the development phase
     # - (comment on exported (method|function|type|const)|should have( a package)? comment|comment should be of the form)
     # not for the active development - can be removed in the stable phase

cmd/package-api/main.go

@@ -85,7 +85,7 @@ func main() {
 
 	// init graceful stop chan
 	log.Debug("Initiating system signal watcher")
-	var gracefulStop = make(chan os.Signal)
+	var gracefulStop = make(chan os.Signal, 1)
 	signal.Notify(gracefulStop, syscall.SIGTERM)
 	signal.Notify(gracefulStop, syscall.SIGINT)
 

go.mod

@@ -3,16 +3,18 @@ module github.com/opengapps/package-api
 go 1.13
 
 require (
-	github.com/google/go-github/v32 v32.1.0
+	github.com/google/go-github/v37 v37.0.0
 	github.com/gorilla/feeds v1.1.1
-	github.com/gorilla/handlers v1.5.0
+	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
-	github.com/nezorflame/opengapps-mirror-bot/pkg/gapps v1.3.0
-	github.com/sirupsen/logrus v1.6.0
+	github.com/opengapps/package-api/pkg/gapps v1.0.0
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.6.1
-	go.etcd.io/bbolt v1.3.5
-	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
-	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+	github.com/spf13/viper v1.8.1
+	github.com/stretchr/testify v1.7.0
+	go.etcd.io/bbolt v1.3.6
+	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )
+
+replace github.com/opengapps/package-api/pkg/gapps => ./pkg/gapps

internal/app/package-api/download.go

@@ -7,8 +7,7 @@ import (
 	"time"
 
 	"github.com/opengapps/package-api/internal/pkg/models"
-
-	"github.com/nezorflame/opengapps-mirror-bot/pkg/gapps"
+	"github.com/opengapps/package-api/pkg/gapps"
 )
 
 const mirrorTemplate = "?r=&ts=%d&use_mirror=autoselect"

internal/app/package-api/list.go

@@ -7,13 +7,12 @@ import (
 
 	"github.com/opengapps/package-api/internal/pkg/db"
 	"github.com/opengapps/package-api/internal/pkg/models"
-
-	"github.com/nezorflame/opengapps-mirror-bot/pkg/gapps"
+	"github.com/opengapps/package-api/pkg/gapps"
 	log "github.com/sirupsen/logrus"
 )
 
 func (a *application) listHandler() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, _ *http.Request) {
 		resp := models.ListResponse{
 			ArchList: make(map[string]models.ArchRecord, 4),
 		}

internal/app/package-api/pkg.go

@@ -7,9 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nezorflame/opengapps-mirror-bot/pkg/gapps"
-
 	"github.com/opengapps/package-api/internal/pkg/db"
+	"github.com/opengapps/package-api/pkg/gapps"
 )
 
 const (

internal/app/package-api/rss.go

@@ -12,7 +12,8 @@ import (
 
 	"github.com/gorilla/feeds"
 	"github.com/gorilla/mux"
-	"github.com/nezorflame/opengapps-mirror-bot/pkg/gapps"
+
+	"github.com/opengapps/package-api/pkg/gapps"
 )
 
 const archAll = "all"

internal/pkg/models/link.go

@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 
-	"github.com/nezorflame/opengapps-mirror-bot/pkg/gapps"
+	"github.com/opengapps/package-api/pkg/gapps"
 )
 
 // Public consts

internal/pkg/models/list.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nezorflame/opengapps-mirror-bot/pkg/gapps"
+	"github.com/opengapps/package-api/pkg/gapps"
 )
 
 // Public consts

pkg/gapps/gapps.go

@@ -0,0 +1,87 @@
+//go:generate enumer -type=Android -json -transform=snake -trimprefix=Android
+//go:generate enumer -type=Platform -json -transform=snake -trimprefix=Platform
+//go:generate enumer -type=Variant -json -transform=snake -trimprefix=Variant
+
+package gapps
+
+import (
+	"fmt"
+)
+
+// Platform is an enum for different chip architectures
+type Platform uint
+
+// Platform consts
+const (
+	PlatformArm Platform = iota
+	PlatformArm64
+	PlatformX86
+	PlatformX86_64
+)
+
+// Android is an enum for different Android versions
+type Android uint
+
+// Android consts
+const (
+	Android44 Android = iota
+	Android50
+	Android51
+	Android60
+	Android70
+	Android71
+	Android80
+	Android81
+	Android90
+	Android100
+	Android110
+)
+
+// HumanString is required for human-readable Android version with . delimiter
+func (a Android) HumanString() string {
+	result := a.String()
+	return result[:len(result)-1] + "." + result[len(result)-1:]
+}
+
+// Variant is an enum for different package variations
+type Variant uint
+
+// Variant consts
+const (
+	VariantTvstock Variant = iota
+	VariantPico
+	VariantNano
+	VariantMicro
+	VariantMini
+	VariantFull
+	VariantStock
+	VariantSuper
+	VariantAroma
+	VariantTvmini
+)
+
+const parsingErrText = "parsing error: %w"
+
+// ParsePackageParts helps to parse package info args into proper parts
+func ParsePackageParts(args []string) (Platform, Android, Variant, error) {
+	if len(args) != 3 {
+		return 0, 0, 0, fmt.Errorf("bad number of arguments: want 4, got %d", len(args))
+	}
+
+	platform, err := PlatformString(args[0])
+	if err != nil {
+		return 0, 0, 0, fmt.Errorf(parsingErrText, err)
+	}
+
+	android, err := AndroidString(args[1])
+	if err != nil {
+		return 0, 0, 0, fmt.Errorf(parsingErrText, err)
+	}
+
+	variant, err := VariantString(args[2])
+	if err != nil {
+		return 0, 0, 0, fmt.Errorf(parsingErrText, err)
+	}
+
+	return platform, android, variant, nil
+}

pkg/gapps/go.mod

@@ -0,0 +1,3 @@
+module github.com/opengapps/package-api/pkg/gapps
+
+go 1.13