refactor: Decompose tell and eject funcs

cmd/stbak/cmd/drive_eject.go

@@ -1,9 +1,7 @@
 package cmd
 
 import (
-	"os"
-
-	"github.com/pojntfx/stfs/internal/controllers"
+	"github.com/pojntfx/stfs/pkg/hardware"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/volatiletech/sqlboiler/v4/boil"
@@ -21,13 +19,11 @@ var driveEjectCmd = &cobra.Command{
 			boil.DebugMode = true
 		}
 
-		f, err := os.OpenFile(viper.GetString(driveFlag), os.O_RDONLY, os.ModeCharDevice)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-
-		return controllers.EjectTape(f)
+		return hardware.Eject(
+			hardware.DriveConfig{
+				Drive: viper.GetString(driveFlag),
+			},
+		)
 	},
 }
 

cmd/stbak/cmd/drive_tell.go

@@ -2,9 +2,8 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 
-	"github.com/pojntfx/stfs/internal/controllers"
+	"github.com/pojntfx/stfs/pkg/hardware"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/volatiletech/sqlboiler/v4/boil"
@@ -22,13 +21,11 @@ var driveTellCmd = &cobra.Command{
 			boil.DebugMode = true
 		}
 
-		f, err := os.OpenFile(viper.GetString(driveFlag), os.O_RDONLY, os.ModeCharDevice)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-
-		currentRecord, err := controllers.GetCurrentRecordFromTape(f)
+		currentRecord, err := hardware.Tell(
+			hardware.DriveConfig{
+				Drive: viper.GetString(driveFlag),
+			},
+		)
 		if err != nil {
 			return err
 		}

pkg/hardware/config.go

@@ -0,0 +1,5 @@
+package hardware
+
+type DriveConfig struct {
+	Drive string
+}

pkg/hardware/eject.go

@@ -0,0 +1,19 @@
+package hardware
+
+import (
+	"os"
+
+	"github.com/pojntfx/stfs/internal/controllers"
+)
+
+func Eject(
+	state DriveConfig,
+) error {
+	f, err := os.OpenFile(state.Drive, os.O_RDONLY, os.ModeCharDevice)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	return controllers.EjectTape(f)
+}

pkg/hardware/hardware.go

@@ -1,13 +0,0 @@
-package hardware
-
-type DriveConfig struct {
-	Drive string
-}
-
-func Eject(
-	state DriveConfig,
-) error
-
-func Tell(
-	state DriveConfig,
-) (int, error)

pkg/hardware/tell.go

@@ -0,0 +1,19 @@
+package hardware
+
+import (
+	"os"
+
+	"github.com/pojntfx/stfs/internal/controllers"
+)
+
+func Tell(
+	state DriveConfig,
+) (int64, error) {
+	f, err := os.OpenFile(state.Drive, os.O_RDONLY, os.ModeCharDevice)
+	if err != nil {
+		return -1, err
+	}
+	defer f.Close()
+
+	return controllers.GetCurrentRecordFromTape(f)
+}