Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-05-26 17:54:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

(tested) refactor code

Browse Source 
* add sentinel master parameter into driver config
* replace yaml double deserialization with `mapstructure` in initializers
* replace struct initializers with registered functions
* add torrent approval MD and a sanitize rest MDs
This commit is contained in:
Lawrence, Rendall
2022-04-16 00:21:47 +03:00
parent 397e106396
commit 8cd8343757
32 changed files with 473 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
middleware/torrentapproval/torrentapproval.go
View File

@@ -6,11 +6,10 @@ import (
"context"
"fmt"
"gopkg.in/yaml.v3"
"github.com/sot-tech/mochi/bittorrent"
"github.com/sot-tech/mochi/middleware"
"github.com/sot-tech/mochi/middleware/torrentapproval/container"
"github.com/sot-tech/mochi/pkg/conf"
// import directory watcher to enable appropriate support
_ "github.com/sot-tech/mochi/middleware/torrentapproval/container/directory"
@@ -25,40 +24,33 @@ import (
const Name = "torrent approval"
func init() {
middleware.RegisterDriver(Name, driver{})
middleware.RegisterBuilder(Name, build)
}
type baseConfig struct {
// Source - name of container for initial values
Source string `yaml:"initial_source"`
Source string `cfg:"initial_source"`
// Configuration depends on used container
Configuration map[string]any `yaml:"configuration"`
Configuration conf.MapConfig
}
type driver struct{}
func (d driver) NewHook(optionBytes []byte, storage storage.Storage) (middleware.Hook, error) {
func build(options conf.MapConfig, storage storage.Storage) (h middleware.Hook, err error) {
var cfg baseConfig
err := yaml.Unmarshal(optionBytes, &cfg)
if err != nil {
return nil, fmt.Errorf("invalid options for middleware %s: %w", Name, err)
if err = options.Unmarshal(&cfg); err != nil {
return nil, fmt.Errorf("middleware %s: %w", Name, err)
}
if len(cfg.Source) == 0 {
return nil, fmt.Errorf("invalid options for middleware %s: name not provided", Name)
return nil, fmt.Errorf("invalid options for middleware %s: source not provided", Name)
}
if cfg.Configuration == nil {
return nil, fmt.Errorf("invalid options for middleware %s: options not provided", Name)
}
var confBytes []byte
var h *hook
if confBytes, err = yaml.Marshal(cfg.Configuration); err == nil {
var c container.Container
if c, err = container.GetContainer(cfg.Source, confBytes, storage); err == nil {
h = &hook{c}
}
var c container.Container
if c, err = container.GetContainer(cfg.Source, cfg.Configuration, storage); err == nil {
h = &hook{c}
}
return h, err
}