From 5c7775cd47467292870519ce3956f82cf68a3058 Mon Sep 17 00:00:00 2001 From: celogeek <65178+celogeek@users.noreply.github.com> Date: Fri, 10 May 2024 18:05:51 +0200 Subject: [PATCH] simplify profiles --- .../converter/options/converter_options.go | 2 +- .../converter/profiles/converter_profiles.go | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/internal/converter/options/converter_options.go b/internal/converter/options/converter_options.go index ec29fb4..f39cea3 100644 --- a/internal/converter/options/converter_options.go +++ b/internal/converter/options/converter_options.go @@ -330,7 +330,7 @@ func (o *Options) SaveConfig() error { // GetProfile shortcut to get current profile func (o *Options) GetProfile() *profiles.Profile { - return o.profiles.Get(o.Profile) + return o.profiles[o.Profile] } // AvailableProfiles all available profiles diff --git a/internal/converter/profiles/converter_profiles.go b/internal/converter/profiles/converter_profiles.go index 139459e..df404ac 100644 --- a/internal/converter/profiles/converter_profiles.go +++ b/internal/converter/profiles/converter_profiles.go @@ -13,11 +13,12 @@ type Profile struct { Height int `json:"height"` } -type Profiles []Profile +type Profiles map[string]*Profile // New Initialize list of all supported profiles. func New() Profiles { - return []Profile{ + res := make(Profiles) + for _, r := range []Profile{ // High Resolution for Tablet {"HR", "High Resolution", 2400, 3840}, {"SR", "Standard Resolution", 1200, 1920}, @@ -50,7 +51,10 @@ func New() Profiles { // reMarkable {"RM1", "reMarkable 1", 1404, 1872}, {"RM2", "reMarkable 2", 1404, 1872}, + } { + res[r.Code] = &r } + return res } func (p Profiles) String() string { @@ -65,13 +69,3 @@ func (p Profiles) String() string { } return strings.Join(s, "\n") } - -// Get Lookup profile by code -func (p Profiles) Get(name string) *Profile { - for _, profile := range p { - if profile.Code == name { - return &profile - } - } - return nil -}