"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
serve dlna: convert options to new style
Nick Craig-Woodeec95a164dbc
diff --git a/cmd/serve/dlna/dlna.go b/cmd/serve/dlna/dlna.goindex 29bdd485f..d3c3751c1 100644--- a/cmd/serve/dlna/dlna.go+++ b/cmd/serve/dlna/dlna.go@@ -128,7 +128,7 @@ func newServer(f fs.Fs, opt *dlnaflags.Options) (*server, error) {}s := &server{- AnnounceInterval: opt.AnnounceInterval,+ AnnounceInterval: time.Duration(opt.AnnounceInterval),FriendlyName: friendlyName,RootDeviceUUID: makeDeviceUUID(friendlyName),Interfaces: interfaces,diff --git a/cmd/serve/dlna/dlna_test.go b/cmd/serve/dlna/dlna_test.goindex d6f7c42e4..f89af7387 100644--- a/cmd/serve/dlna/dlna_test.go+++ b/cmd/serve/dlna/dlna_test.go@@ -35,7 +35,7 @@ const ()func startServer(t *testing.T, f fs.Fs) {- opt := dlnaflags.DefaultOpt+ opt := dlnaflags.Optopt.ListenAddr = testBindAddressvar err errordlnaServer, err = newServer(f, &opt)diff --git a/cmd/serve/dlna/dlnaflags/dlnaflags.go b/cmd/serve/dlna/dlnaflags/dlnaflags.goindex 3a4da76ab..9c42e9364 100644--- a/cmd/serve/dlna/dlnaflags/dlnaflags.go+++ b/cmd/serve/dlna/dlnaflags/dlnaflags.go@@ -4,8 +4,8 @@ package dlnaflagsimport ("time"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/flags"- "github.com/rclone/rclone/fs/rc""github.com/spf13/pflag")@@ -24,39 +24,46 @@ logging of all UPNP traffic.`-// Options is the type for DLNA serving options.-type Options struct {- ListenAddr string- FriendlyName string- LogTrace bool- InterfaceNames []string- AnnounceInterval time.Duration+// OptionsInfo descripts the Options in use+var OptionsInfo = fs.Options{{+ Name: "addr",+ Default: ":7879",+ Help: "The ip:port or :port to bind the DLNA http server to",+}, {+ Name: "name",+ Default: "",+ Help: "Name of DLNA server",+}, {+ Name: "log_trace",+ Default: false,+ Help: "Enable trace logging of SOAP traffic",+}, {+ Name: "interface",+ Default: []string{},+ Help: "The interface to use for SSDP (repeat as necessary)",+}, {+ Name: "announce_interval",+ Default: fs.Duration(12 * time.Minute),+ Help: "The interval between SSDP announcements",+}}++func init() {+ fs.RegisterGlobalOptions(fs.OptionsInfo{Name: "dlna", Opt: &Opt, Options: OptionsInfo})}-// DefaultOpt contains the defaults options for DLNA serving.-var DefaultOpt = Options{- ListenAddr: ":7879",- FriendlyName: "",- LogTrace: false,- InterfaceNames: []string{},- AnnounceInterval: 12 * time.Minute,+// Options is the type for DLNA serving options.+type Options struct {+ ListenAddr string `config:"addr"`+ FriendlyName string `config:"name"`+ LogTrace bool `config:"log_trace"`+ InterfaceNames []string `config:"interface"`+ AnnounceInterval fs.Duration `config:"announce_interval"`}// Opt contains the options for DLNA serving.-var (- Opt = DefaultOpt-)--func addFlagsPrefix(flagSet *pflag.FlagSet, prefix string, Opt *Options) {- rc.AddOption("dlna", &Opt)- flags.StringVarP(flagSet, &Opt.ListenAddr, prefix+"addr", "", Opt.ListenAddr, "The ip:port or :port to bind the DLNA http server to", prefix)- flags.StringVarP(flagSet, &Opt.FriendlyName, prefix+"name", "", Opt.FriendlyName, "Name of DLNA server", prefix)- flags.BoolVarP(flagSet, &Opt.LogTrace, prefix+"log-trace", "", Opt.LogTrace, "Enable trace logging of SOAP traffic", prefix)- flags.StringArrayVarP(flagSet, &Opt.InterfaceNames, prefix+"interface", "", Opt.InterfaceNames, "The interface to use for SSDP (repeat as necessary)", prefix)- flags.DurationVarP(flagSet, &Opt.AnnounceInterval, prefix+"announce-interval", "", Opt.AnnounceInterval, "The interval between SSDP announcements", prefix)-}+var Opt Options// AddFlags add the command line flags for DLNA serving.func AddFlags(flagSet *pflag.FlagSet) {- addFlagsPrefix(flagSet, "", &Opt)+ flags.AddFlagsFromOptions(flagSet, "", OptionsInfo)}