better top

[micro.git] / internal / config / plugin_manager.go

diff --git a/internal/config/plugin_manager.go b/internal/config/plugin_manager.go
index 19f53cdc795766b12265211527c297cb88450fd7..d64aab11de81008ac8ce043e9bc4dd0e2802115b 100644 (file)
--- a/internal/config/plugin_manager.go
+++ b/internal/config/plugin_manager.go
@@ -7,12 +7,9 @@ import (
 )
 
 var (
-       ErrMissingName    = errors.New("Missing or empty name field")
-       ErrMissingDesc    = errors.New("Missing or empty description field")
-       ErrMissingSite    = errors.New("Missing or empty website field")
-       ErrMissingInstall = errors.New("Missing or empty install field")
-       ErrMissingVstr    = errors.New("Missing or empty versions field")
-       ErrMissingRequire = errors.New("Missing or empty require field")
+       ErrMissingName = errors.New("Missing or empty name field")
+       ErrMissingDesc = errors.New("Missing or empty description field")
+       ErrMissingSite = errors.New("Missing or empty website field")
 )
 
 // PluginInfo contains all the needed info about a plugin
@@ -27,19 +24,16 @@ var (
 // Vstr: version
 // Require: list of dependencies and requirements
 type PluginInfo struct {
-       Name    string   `json:"name"`
-       Desc    string   `json:"description"`
-       Site    string   `json:"website"`
-       Install string   `json:"install"`
-       Vstr    string   `json:"version"`
-       Require []string `json:"require"`
+       Name string `json:"Name"`
+       Desc string `json:"Description"`
+       Site string `json:"Website"`
 }
 
 // NewPluginInfo parses a JSON input into a valid PluginInfo struct
 // Returns an error if there are any missing fields or any invalid fields
 // There are no optional fields in a plugin info json file
 func NewPluginInfo(data []byte) (*PluginInfo, error) {
-       var info PluginInfo
+       var info []PluginInfo
 
        dec := json.NewDecoder(bytes.NewReader(data))
        // dec.DisallowUnknownFields() // Force errors
@@ -48,19 +42,5 @@ func NewPluginInfo(data []byte) (*PluginInfo, error) {
                return nil, err
        }
 
-       // if len(info.Name) == 0 {
-       //      return nil, ErrMissingName
-       // } else if len(info.Desc) == 0 {
-       //      return nil, ErrMissingDesc
-       // } else if len(info.Site) == 0 {
-       //      return nil, ErrMissingSite
-       // } else if len(info.Install) == 0 {
-       //      return nil, ErrMissingInstall
-       // } else if len(info.Vstr) == 0 {
-       //      return nil, ErrMissingVstr
-       // } else if len(info.Require) == 0 {
-       //      return nil, ErrMissingRequire
-       // }
-
-       return &info, nil
+       return &info[0], nil
 }