Refactor power level feature (#59)

Co-authored-by: Yijia Chen <[email protected]>

Author: yijia-cc

.dockerignore

@@ -1,3 +1,4 @@
 *.sketch
 *.md
 /build
+*.md

.drone.yml

@@ -5,9 +5,14 @@ name: default
 steps:
   - name: test
     pull: if-not-exists
-    image: harbor.internal.teamyapp.com/internal/candy-client:latest
+    image: harbor.internal.teamyapp.com/internal/candy-ui-test:latest
     commands:
       - go mod download
-      - go test ./...
+      - xvfb-run go test ./...
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
 image_pull_secrets:
-  - dockerconfig
+  - dockerconfig

.editorconfig

@@ -7,10 +7,6 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
-indent_style = space
+indent_style = tab
 indent_size = 4
 charset = utf-8
-
-# Tab indentation (no size specified)
-[Makefile]
-indent_style = tab

Dockerfile-test

@@ -0,0 +1,4 @@
+FROM harbor.internal.teamyapp.com/internal/candy-client
+
+# Configure virtual display inside Docker for GLFW
+RUN apt install -y xvfb

assets/assets.go

@@ -1,101 +1,101 @@
 package assets
 
 import (
-    "image"
-    _ "image/jpeg"
-    _ "image/png"
-    "os"
-    "path/filepath"
-    "strings"
+	"image"
+	_ "image/jpeg"
+	_ "image/png"
+	"os"
+	"path/filepath"
+	"strings"
 
-    "candy/audio"
+	"candy/audio"
 )
 
 var imageExtensions = map[string]struct{}{"jpg": {}, "png": {}}
 var audioExtensions = map[string]struct{}{"mp3": {}, "wav": {}}
 
 type Assets struct {
-    imageMap map[string]image.Image
-    audioMap map[string]audio.Audio
+  imageMap map[string]image.Image
+	audioMap map[string]audio.Audio
 }
 
 func (a Assets) GetImage(imageName string) image.Image {
-    return a.imageMap[convertPath(imageName)]
+  return a.imageMap[convertPath(imageName)]
 }
 
 func (a Assets) GetAudio(audioName string) audio.Audio {
-    return a.audioMap[convertPath(audioName)]
+  return a.audioMap[convertPath(audioName)]
 }
 
 func convertPath(path string) string {
-    parts := strings.Split(path, "/")
-    return filepath.Join(parts...)
+  parts := strings.Split(path, "/")
+  return filepath.Join(parts...)
 }
 
 func LoadAssets(assetRootDir string) (Assets, error) {
-    imageAssets, err := loadImages(assetRootDir)
-    if err != nil {
-        return Assets{}, err
-    }
-    audioAssets, err := loadAudios(assetRootDir)
-    return Assets{
-        imageMap: imageAssets,
-        audioMap: audioAssets,
-    }, err
+	imageAssets, err := loadImages(assetRootDir)
+	if err != nil {
+		return Assets{}, err
+	}
+	audioAssets, err := loadAudios(assetRootDir)
+	return Assets{
+		imageMap: imageAssets,
+		audioMap: audioAssets,
+	}, err
 }
 
 func loadAudios(assetRootDir string) (map[string]audio.Audio, error) {
-    audioAssets := make(map[string]audio.Audio)
-    err := lisFiles(assetRootDir, func(path string, ext string, rel string) error {
-        if _, ok := audioExtensions[ext]; !ok {
-            return nil
-        }
-        file, err := os.Open(path)
-        if err != nil {
-            return err
-        }
-        bp, err := audio.NewAudio(file, ext)
-        if err != nil {
-            return err
-        }
-        audioAssets[rel] = bp
-        return nil
-    })
-    return audioAssets, err
+	audioAssets := make(map[string]audio.Audio)
+	err := lisFiles(assetRootDir, func(path string, ext string, rel string) error {
+		if _, ok := audioExtensions[ext]; !ok {
+			return nil
+		}
+		file, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		bp, err := audio.NewAudio(file, ext)
+		if err != nil {
+			return err
+		}
+		audioAssets[rel] = bp
+		return nil
+	})
+	return audioAssets, err
 }
 
 func loadImages(assetRootDir string) (map[string]image.Image, error) {
-    imageAssets := make(map[string]image.Image)
-    err := lisFiles(assetRootDir, func(path string, ext string, rel string) error {
-        if _, ok := imageExtensions[ext]; !ok {
-            return nil
-        }
-        file, err := os.Open(path)
-        defer file.Close()
-        if err != nil {
-            return err
-        }
-        img, _, err := image.Decode(file)
-        if err != nil {
-            return err
-        }
-        imageAssets[rel] = img
-        return nil
-    })
-    return imageAssets, err
+	imageAssets := make(map[string]image.Image)
+	err := lisFiles(assetRootDir, func(path string, ext string, rel string) error {
+		if _, ok := imageExtensions[ext]; !ok {
+			return nil
+		}
+		file, err := os.Open(path)
+		defer file.Close()
+		if err != nil {
+			return err
+		}
+		img, _, err := image.Decode(file)
+		if err != nil {
+			return err
+		}
+		imageAssets[rel] = img
+		return nil
+	})
+	return imageAssets, err
 }
 
 func lisFiles(rootDir string, processFile func(path string, ext string, rel string) error) error {
-    return filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
-        if info.IsDir() {
-            return nil
-        }
-        parts := strings.Split(info.Name(), ".")
-        if len(parts) == 0 {
-            return nil
-        }
-        ext := parts[len(parts)-1]
-        rel, err := filepath.Rel(rootDir, path)
-        return processFile(path, ext, rel)
-    })
+	return filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
+		if info.IsDir() {
+			return nil
+		}
+		parts := strings.Split(info.Name(), ".")
+		if len(parts) == 0 {
+			return nil
+		}
+		ext := parts[len(parts)-1]
+		rel, err := filepath.Rel(rootDir, path)
+		return processFile(path, ext, rel)
+	})
 }

audio/audio.go

@@ -1,14 +1,14 @@
 package audio
 
 import (
-    "os"
+	"os"
 )
 
 type Audio interface {
-    Play()
-    Stop()
+	Play()
+	Stop()
 }
 
 func NewAudio(file *os.File, extension string) (Audio, error) {
-    return newBeep(file, extension)
+	return newBeep(file, extension)
 }

audio/beep.go

@@ -1,13 +1,13 @@
 package audio
 
 import (
-    "os"
-    "time"
+	"os"
+	"time"
 
-    "github.com/faiface/beep"
-    "github.com/faiface/beep/mp3"
-    "github.com/faiface/beep/speaker"
-    "github.com/faiface/beep/wav"
+	"github.com/faiface/beep"
+	"github.com/faiface/beep/mp3"
+	"github.com/faiface/beep/speaker"
+	"github.com/faiface/beep/wav"
 )
 
 const mp3Extension = "mp3"
@@ -16,39 +16,39 @@ const wavExtension = "wav"
 type audioDecoder = func(f *os.File) (s beep.StreamSeekCloser, format beep.Format, err error)
 
 var beepDecoders = map[string]audioDecoder{
-    mp3Extension: func(f *os.File) (s beep.StreamSeekCloser, format beep.Format, err error) {
-        return mp3.Decode(f)
-    },
-    wavExtension: func(f *os.File) (s beep.StreamSeekCloser, format beep.Format, err error) {
-        return wav.Decode(f)
-    }}
+	mp3Extension: func(f *os.File) (s beep.StreamSeekCloser, format beep.Format, err error) {
+		return mp3.Decode(f)
+	},
+	wavExtension: func(f *os.File) (s beep.StreamSeekCloser, format beep.Format, err error) {
+		return wav.Decode(f)
+	}}
 
 var _ Audio = (*Beep)(nil)
 
 type Beep struct {
-    streamer beep.StreamSeekCloser
-    format   beep.Format
+	streamer beep.StreamSeekCloser
+	format   beep.Format
 }
 
 func (b Beep) Play() {
-    err := speaker.Init(b.format.SampleRate, b.format.SampleRate.N(time.Second/10))
-    if err != nil {
-        return
-    }
-    speaker.Play(b.streamer)
+	err := speaker.Init(b.format.SampleRate, b.format.SampleRate.N(time.Second/10))
+	if err != nil {
+		return
+	}
+	speaker.Play(b.streamer)
 }
 
 func (b Beep) Stop() {
-    b.streamer.Close()
+	b.streamer.Close()
 }
 
 func newBeep(file *os.File, extension string) (Beep, error) {
-    streamer, format, err := beepDecoders[extension](file)
-    if err != nil {
-        return Beep{}, err
-    }
-    return Beep{
-        streamer: streamer,
-        format:   format,
-    }, nil
+	streamer, format, err := beepDecoders[extension](file)
+	if err != nil {
+		return Beep{}, err
+	}
+	return Beep{
+		streamer: streamer,
+		format:   format,
+	}, nil
 }