marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-04-16 01:59:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow specifying --timestamp 0

Browse source
This commit is contained in:
Philipp Wolfer 2023-12-09 18:56:23 +01:00
parent 2307e6247b
commit e7d596b4e0
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/beam_listens.go
View file

@ -17,6 +17,8 @@ Scotty. If not, see <https://www.gnu.org/licenses/>.
package cmd package cmd
import ( import (
"math"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.uploadedlobster.com/scotty/internal/backends" "go.uploadedlobster.com/scotty/internal/backends"
"go.uploadedlobster.com/scotty/internal/cli" "go.uploadedlobster.com/scotty/internal/cli"
@ -58,5 +60,5 @@ func init() {
// Cobra supports local flags which will only run when this command // Cobra supports local flags which will only run when this command
// is called directly, e.g.: // is called directly, e.g.:
// beamListensCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") // beamListensCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
beamListensCmd.Flags().Int64P("timestamp", "t", 0, "Only import listens newer then given Unix timestamp") beamListensCmd.Flags().Int64P("timestamp", "t", math.MinInt64, "Only import listens newer then given Unix timestamp")
} }

8
internal/cli/transfer.go
View file

@ -17,6 +17,7 @@ package cli
import ( import (
"fmt" "fmt"
"math"
"sync" "sync"
"time" "time"
@ -153,12 +154,13 @@ func (c *TransferCmd[E, I, R]) Transfer(exp backends.ExportProcessor[R], imp bac
} }
func (c *TransferCmd[E, I, R]) timestamp() (time.Time, error) { func (c *TransferCmd[E, I, R]) timestamp() (time.Time, error) {
timestamp := time.Unix(getInt64FromFlag(c.cmd, "timestamp"), 0) flagValue, err := c.cmd.Flags().GetInt64("timestamp")
if timestamp == time.Unix(0, 0) { if err == nil && flagValue > math.MinInt64 {
return time.Unix(flagValue, 0), nil
} else {
timestamp, err := c.db.GetImportTimestamp(c.sourceName, c.targetName, c.entity) timestamp, err := c.db.GetImportTimestamp(c.sourceName, c.targetName, c.entity)
return timestamp, err return timestamp, err
} }
return timestamp, nil
} }
func (c *TransferCmd[E, I, R]) updateTimestamp(result models.ImportResult, oldTimestamp time.Time) error { func (c *TransferCmd[E, I, R]) updateTimestamp(result models.ImportResult, oldTimestamp time.Time) error {