mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Use explicit interface instead of os.File for drive backend

Browse Source
This commit is contained in:
Felicitas Pojtinger
2022-01-07 22:27:14 +01:00
parent 314e60f9b1
commit f45f8b1499
9 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/recovery/fetch.go
View File

@@ -46,7 +46,7 @@ func Fetch(
tr = tar.NewReader(reader.Drive)
} else {
// Seek to record
if err := mtio.SeekToRecordOnTape(drive.Drive, int32(record)); err != nil {
if err := mtio.SeekToRecordOnTape(drive.Drive.Fd(), int32(record)); err != nil {
return err
}

6
pkg/recovery/index.go
View File

@@ -150,7 +150,7 @@ func Index(
}
} else {
// Seek to record
if err := mtio.SeekToRecordOnTape(drive.Drive, int32(record)); err != nil {
if err := mtio.SeekToRecordOnTape(drive.Drive.Fd(), int32(record)); err != nil {
return err
}
@@ -172,13 +172,13 @@ func Index(
hdr, err := tr.Next()
if err != nil {
if err == io.EOF {
if err := mtio.GoToNextFileOnTape(drive.Drive); err != nil {
if err := mtio.GoToNextFileOnTape(drive.Drive.Fd()); err != nil {
// EOD
break
}
record, err = mtio.GetCurrentRecordFromTape(drive.Drive)
record, err = mtio.GetCurrentRecordFromTape(drive.Drive.Fd())
if err != nil {
return err
}

6
pkg/recovery/query.go
View File

@@ -132,7 +132,7 @@ func Query(
}
} else {
// Seek to record
if err := mtio.SeekToRecordOnTape(state.Drive, int32(record)); err != nil {
if err := mtio.SeekToRecordOnTape(state.Drive.Fd(), int32(record)); err != nil {
return []*tar.Header{}, err
}
@@ -153,13 +153,13 @@ func Query(
hdr, err := tr.Next()
if err != nil {
if err == io.EOF {
if err := mtio.GoToNextFileOnTape(state.Drive); err != nil {
if err := mtio.GoToNextFileOnTape(state.Drive.Fd()); err != nil {
// EOD
break
}
record, err = mtio.GetCurrentRecordFromTape(state.Drive)
record, err = mtio.GetCurrentRecordFromTape(state.Drive.Fd())
if err != nil {
return []*tar.Header{}, err
}