From 9f06a5fa4b1a6288bc0d1b7b73e25974d12600e2 Mon Sep 17 00:00:00 2001 From: Felicitas Pojtinger Date: Sun, 19 Dec 2021 18:29:33 +0100 Subject: [PATCH] refactor: Move `stbak` command to root --- README.md | 6 +++--- cmd/{stbak/cmd => }/drive_eject.go | 0 cmd/{stbak/cmd => }/drive_root.go | 0 cmd/{stbak/cmd => }/drive_tell.go | 0 cmd/{stbak/cmd => }/inventory_find.go | 0 cmd/{stbak/cmd => }/inventory_list.go | 0 cmd/{stbak/cmd => }/inventory_root.go | 0 cmd/{stbak/cmd => }/inventory_stat.go | 0 cmd/{stbak/cmd => }/keygen.go | 0 cmd/{stbak/cmd => }/operation_archive.go | 0 cmd/{stbak/cmd => }/operation_delete.go | 0 cmd/{stbak/cmd => }/operation_move.go | 0 cmd/{stbak/cmd => }/operation_restore.go | 0 cmd/{stbak/cmd => }/operation_root.go | 0 cmd/{stbak/cmd => }/operation_update.go | 0 cmd/{stbak/cmd => }/recovery_fetch.go | 0 cmd/{stbak/cmd => }/recovery_index.go | 0 cmd/{stbak/cmd => }/recovery_query.go | 0 cmd/{stbak/cmd => }/recovery_root.go | 0 cmd/{stbak/cmd => }/root.go | 10 +++++----- cmd/{stbak/cmd => }/serve_ftp.go | 0 cmd/{stbak/cmd => }/serve_http.go | 0 cmd/{stbak/cmd => }/serve_root.go | 0 cmd/stbak/main.go | 7 ------- main.go | 7 +++++++ 25 files changed, 15 insertions(+), 15 deletions(-) rename cmd/{stbak/cmd => }/drive_eject.go (100%) rename cmd/{stbak/cmd => }/drive_root.go (100%) rename cmd/{stbak/cmd => }/drive_tell.go (100%) rename cmd/{stbak/cmd => }/inventory_find.go (100%) rename cmd/{stbak/cmd => }/inventory_list.go (100%) rename cmd/{stbak/cmd => }/inventory_root.go (100%) rename cmd/{stbak/cmd => }/inventory_stat.go (100%) rename cmd/{stbak/cmd => }/keygen.go (100%) rename cmd/{stbak/cmd => }/operation_archive.go (100%) rename cmd/{stbak/cmd => }/operation_delete.go (100%) rename cmd/{stbak/cmd => }/operation_move.go (100%) rename cmd/{stbak/cmd => }/operation_restore.go (100%) rename cmd/{stbak/cmd => }/operation_root.go (100%) rename cmd/{stbak/cmd => }/operation_update.go (100%) rename cmd/{stbak/cmd => }/recovery_fetch.go (100%) rename cmd/{stbak/cmd => }/recovery_index.go (100%) rename cmd/{stbak/cmd => }/recovery_query.go (100%) rename cmd/{stbak/cmd => }/recovery_root.go (100%) rename cmd/{stbak/cmd => }/root.go (89%) rename cmd/{stbak/cmd => }/serve_ftp.go (100%) rename cmd/{stbak/cmd => }/serve_http.go (100%) rename cmd/{stbak/cmd => }/serve_root.go (100%) delete mode 100644 cmd/stbak/main.go create mode 100644 main.go diff --git a/README.md b/README.md index 5df315f..237d74e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# stfs +# STFS -Simple Tape File System, a FUSE based on tar and SQLite for tape drives. +Simple Tape File System (STFS), a file system for tapes and tar files. ## Overview @@ -8,6 +8,6 @@ Simple Tape File System, a FUSE based on tar and SQLite for tape drives. ## License -stfs (c) 2021 Felicitas Pojtinger and contributors +STFS (c) 2021 Felicitas Pojtinger and contributors SPDX-License-Identifier: AGPL-3.0 diff --git a/cmd/stbak/cmd/drive_eject.go b/cmd/drive_eject.go similarity index 100% rename from cmd/stbak/cmd/drive_eject.go rename to cmd/drive_eject.go diff --git a/cmd/stbak/cmd/drive_root.go b/cmd/drive_root.go similarity index 100% rename from cmd/stbak/cmd/drive_root.go rename to cmd/drive_root.go diff --git a/cmd/stbak/cmd/drive_tell.go b/cmd/drive_tell.go similarity index 100% rename from cmd/stbak/cmd/drive_tell.go rename to cmd/drive_tell.go diff --git a/cmd/stbak/cmd/inventory_find.go b/cmd/inventory_find.go similarity index 100% rename from cmd/stbak/cmd/inventory_find.go rename to cmd/inventory_find.go diff --git a/cmd/stbak/cmd/inventory_list.go b/cmd/inventory_list.go similarity index 100% rename from cmd/stbak/cmd/inventory_list.go rename to cmd/inventory_list.go diff --git a/cmd/stbak/cmd/inventory_root.go b/cmd/inventory_root.go similarity index 100% rename from cmd/stbak/cmd/inventory_root.go rename to cmd/inventory_root.go diff --git a/cmd/stbak/cmd/inventory_stat.go b/cmd/inventory_stat.go similarity index 100% rename from cmd/stbak/cmd/inventory_stat.go rename to cmd/inventory_stat.go diff --git a/cmd/stbak/cmd/keygen.go b/cmd/keygen.go similarity index 100% rename from cmd/stbak/cmd/keygen.go rename to cmd/keygen.go diff --git a/cmd/stbak/cmd/operation_archive.go b/cmd/operation_archive.go similarity index 100% rename from cmd/stbak/cmd/operation_archive.go rename to cmd/operation_archive.go diff --git a/cmd/stbak/cmd/operation_delete.go b/cmd/operation_delete.go similarity index 100% rename from cmd/stbak/cmd/operation_delete.go rename to cmd/operation_delete.go diff --git a/cmd/stbak/cmd/operation_move.go b/cmd/operation_move.go similarity index 100% rename from cmd/stbak/cmd/operation_move.go rename to cmd/operation_move.go diff --git a/cmd/stbak/cmd/operation_restore.go b/cmd/operation_restore.go similarity index 100% rename from cmd/stbak/cmd/operation_restore.go rename to cmd/operation_restore.go diff --git a/cmd/stbak/cmd/operation_root.go b/cmd/operation_root.go similarity index 100% rename from cmd/stbak/cmd/operation_root.go rename to cmd/operation_root.go diff --git a/cmd/stbak/cmd/operation_update.go b/cmd/operation_update.go similarity index 100% rename from cmd/stbak/cmd/operation_update.go rename to cmd/operation_update.go diff --git a/cmd/stbak/cmd/recovery_fetch.go b/cmd/recovery_fetch.go similarity index 100% rename from cmd/stbak/cmd/recovery_fetch.go rename to cmd/recovery_fetch.go diff --git a/cmd/stbak/cmd/recovery_index.go b/cmd/recovery_index.go similarity index 100% rename from cmd/stbak/cmd/recovery_index.go rename to cmd/recovery_index.go diff --git a/cmd/stbak/cmd/recovery_query.go b/cmd/recovery_query.go similarity index 100% rename from cmd/stbak/cmd/recovery_query.go rename to cmd/recovery_query.go diff --git a/cmd/stbak/cmd/recovery_root.go b/cmd/recovery_root.go similarity index 100% rename from cmd/stbak/cmd/recovery_root.go rename to cmd/recovery_root.go diff --git a/cmd/stbak/cmd/root.go b/cmd/root.go similarity index 89% rename from cmd/stbak/cmd/root.go rename to cmd/root.go index 0dafea2..ec3047c 100644 --- a/cmd/stbak/cmd/root.go +++ b/cmd/root.go @@ -25,14 +25,14 @@ const ( ) var rootCmd = &cobra.Command{ - Use: "stbak", - Short: "Simple Tape Backup", - Long: `Simple Tape Backup (stbak) is a CLI to interact with STFS-managed tapes, tar files and indexes. + Use: "stfs", + Short: "Simple Tape File System", + Long: `Simple Tape File System (STFS) is a file system for tapes and tar files. Find more information at: https://github.com/pojntfx/stfs`, PersistentPreRunE: func(cmd *cobra.Command, args []string) error { - viper.SetEnvPrefix("stbak") + viper.SetEnvPrefix("stfs") viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_")) if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil { @@ -61,7 +61,7 @@ func Execute() { if err != nil { panic(err) } - metadataPath := filepath.Join(home, ".local", "share", "stbak", "var", "lib", "stbak", "metadata.sqlite") + metadataPath := filepath.Join(home, ".local", "share", "stfs", "var", "lib", "stfs", "metadata.sqlite") rootCmd.PersistentFlags().StringP(driveFlag, "d", "/dev/nst0", "Tape or tar file to use") rootCmd.PersistentFlags().StringP(metadataFlag, "m", metadataPath, "Metadata database to use") diff --git a/cmd/stbak/cmd/serve_ftp.go b/cmd/serve_ftp.go similarity index 100% rename from cmd/stbak/cmd/serve_ftp.go rename to cmd/serve_ftp.go diff --git a/cmd/stbak/cmd/serve_http.go b/cmd/serve_http.go similarity index 100% rename from cmd/stbak/cmd/serve_http.go rename to cmd/serve_http.go diff --git a/cmd/stbak/cmd/serve_root.go b/cmd/serve_root.go similarity index 100% rename from cmd/stbak/cmd/serve_root.go rename to cmd/serve_root.go diff --git a/cmd/stbak/main.go b/cmd/stbak/main.go deleted file mode 100644 index 3c0e3de..0000000 --- a/cmd/stbak/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/pojntfx/stfs/cmd/stbak/cmd" - -func main() { - cmd.Execute() -} diff --git a/main.go b/main.go new file mode 100644 index 0000000..3120e2f --- /dev/null +++ b/main.go @@ -0,0 +1,7 @@ +package main + +import "github.com/pojntfx/stfs/cmd" + +func main() { + cmd.Execute() +}