Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,10 @@ func main() {
slog.Info("Starting")

runProcess := func(since int64) int64 {
slog.Debug("Processing", "since", time.Unix(since, 0).Format(time.RFC3339))
newSince := time.Now().Unix()
links, err := pocketClient.Retrive(since)
if err == pocket.ErrEmptyList {
slog.Info("No new data from Pocket")
slog.Debug("Processing", "since", since)
links, newSince, err := pocketClient.Retrive(since)
if len(links) == 0 {
slog.Debug("No new data from Pocket")
return newSince
}
if err != nil {
Expand Down
15 changes: 9 additions & 6 deletions pocket/pocket.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const (
)

var (
ErrEmptyList = errors.New("empty list")
ErrSomethingWentWrong = errors.New("Something Went Wrong")
)

Expand All @@ -61,11 +60,12 @@ func New(consumerKey, accessToken string) (*Pocket, error) {
}, nil
}

func (p *Pocket) Retrive(since int64) ([]string, error) {
func (p *Pocket) Retrive(since int64) ([]string, int64, error) {
request, _ := http.NewRequest(http.MethodPost, endpoint, nil)
request.Header.Add("Content-Type", "application/json")
request.Header.Add("X-Accept", "application/json")

var newSince int64
operation := func(offset int) ([]string, error) {
body := p.body
body, _ = sjson.Set(body, "since", since)
Expand All @@ -90,8 +90,11 @@ func (p *Pocket) Retrive(since int64) ([]string, error) {
return nil, ErrSomethingWentWrong
}

// Update since
newSince = gjson.Get(bodyString, "since").Int()

if gjson.Get(bodyString, "status").Int() == 2 {
return nil, ErrEmptyList
return nil, nil
}

list := gjson.Get(bodyString, "list").Map()
Expand Down Expand Up @@ -123,7 +126,7 @@ func (p *Pocket) Retrive(since int64) ([]string, error) {
if errors.Is(err, ErrSomethingWentWrong) {
break
}
if err != nil && !errors.Is(err, ErrEmptyList) {
if err != nil {
continue
}

Expand All @@ -148,7 +151,7 @@ func (p *Pocket) Retrive(since int64) ([]string, error) {
var links []string
links, err = retrive(offset)
if err != nil {
return nil, err
return nil, newSince, err
}
count = len(links)
if count > 0 {
Expand All @@ -157,5 +160,5 @@ func (p *Pocket) Retrive(since int64) ([]string, error) {
offset += pocketCount
}

return result, nil
return result, newSince, nil
}
Loading