From c2671a57fea7457fb24a3d65f5f4a2a1cc65bebe Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 12 Sep 2024 21:53:54 +0300 Subject: add pending.delete --- internal/server/repository/pending.go | 13 +++++++++++-- internal/server/repository/pending_test.go | 22 ++++++++++++++++++++++ internal/server/repository/repository.go | 23 ++++++++++++++++------- 3 files changed, 49 insertions(+), 9 deletions(-) (limited to 'internal/server') diff --git a/internal/server/repository/pending.go b/internal/server/repository/pending.go index 56a1bd6..f03c8fd 100644 --- a/internal/server/repository/pending.go +++ b/internal/server/repository/pending.go @@ -10,11 +10,11 @@ type pending struct { } func newPending() pending { - return pending{platforms: make(map[types.PlatformName]pendingEntries)} + return pending{make(map[types.PlatformName]pendingEntries)} } func (p pending) add(platform types.PlatformName, id types.EntryID) { - pe, ok := p.get(platform) + pe, ok := p.platforms[platform] if !ok { pe = make(pendingEntries) } @@ -22,6 +22,15 @@ func (p pending) add(platform types.PlatformName, id types.EntryID) { p.platforms[platform] = pe } +func (p pending) delete(platform types.PlatformName, id types.EntryID) { + pe, ok := p.platforms[platform] + if !ok { + return + } + delete(pe, id) + p.platforms[platform] = pe +} + func (p pending) get(platform types.PlatformName) (pendingEntries, bool) { pe, ok := p.platforms[platform] return pe, ok diff --git a/internal/server/repository/pending_test.go b/internal/server/repository/pending_test.go index 16d0d39..e74771c 100644 --- a/internal/server/repository/pending_test.go +++ b/internal/server/repository/pending_test.go @@ -28,3 +28,25 @@ func TestPendingAdd(t *testing.T) { t.Error("expected two entries") } } + +func TestPendingDelete(t *testing.T) { + pending := newPending() + if entries, ok := pending.get(types.LinkedIn); ok { + t.Error("expected not an ok", entries) + } + + pending.add(types.LinkedIn, "fooid") + + entries, ok := pending.get(types.LinkedIn) + if !ok { + t.Error("expected ok return status") + } + if len(entries) != 1 { + t.Error("expected one entry") + } + + pending.delete(types.LinkedIn, "fooid") + if entries, _ = pending.get(types.LinkedIn); len(entries) > 0 { + t.Error("expected zero results", entries) + } +} diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go index f0eff12..e8cec81 100644 --- a/internal/server/repository/repository.go +++ b/internal/server/repository/repository.go @@ -104,10 +104,7 @@ func (r Repository) load() error { errs = append(errs, err) continue } - - r.mu.Lock() - r.entries[entry.ID] = entry - r.mu.Unlock() + r.putMemoryOnly(entry) } if len(errs) == 0 { @@ -145,9 +142,7 @@ func (r Repository) ListBytes() ([]byte, error) { // Is a bit more refined, tries to merge the same entry wich are slightly // different into the same entry. func (r Repository) put(entry types.Entry) error { - r.mu.Lock() - defer r.mu.Unlock() - r.entries[entry.ID] = entry + r.putMemoryOnly(entry) bytes, err := entry.JSONMarshal() if err != err { @@ -156,6 +151,20 @@ func (r Repository) put(entry types.Entry) error { return r.fs.WriteFile(r.entryPath(entry), bytes) } +// putMemoryOnly is the same as put but don't write to disk. +func (r Repository) putMemoryOnly(entry types.Entry) { + r.mu.Lock() + defer r.mu.Unlock() + + r.entries[entry.ID] = entry + + for _, platform := range r.conf.SocialPlatformsEnabled { + if !entry.IsShared(platform) { + r.pending.add(platform, entry.ID) + } + } +} + func (r Repository) Get(id types.EntryID) (types.Entry, error) { if !r.getIdRe.MatchString(id) { return types.Entry{}, fmt.Errorf("invalid id %s", id) -- cgit v1.2.3