From ce22af5eb8c94f2a817fca326efc6bea680e63cc Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 30 Mar 2026 12:58:26 +0000 Subject: object/store: Reorganize files --- object/store/quarantine.go | 28 ---------------------------- object/store/writer.go | 32 -------------------------------- object/store/writer_object.go | 37 +++++++++++++++++++++++++++++++++++++ object/store/writer_pack.go | 26 ++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 60 deletions(-) delete mode 100644 object/store/writer.go create mode 100644 object/store/writer_object.go create mode 100644 object/store/writer_pack.go diff --git a/object/store/quarantine.go b/object/store/quarantine.go index b827d843..1908ab9b 100644 --- a/object/store/quarantine.go +++ b/object/store/quarantine.go @@ -11,31 +11,3 @@ type Quarantine interface { // Discard abandons quarantined writes. Discard() error } - -// ObjectQuarantine represents one quarantined object-wise write. -type ObjectQuarantine interface { - Quarantine - ObjectWriter -} - -// PackQuarantine represents one quarantined pack-wise write. -type PackQuarantine interface { - Quarantine - PackWriter -} - -// ObjectQuarantineOptions controls the options for one object quarantine creation. -type ObjectQuarantineOptions struct{} - -// PackQuarantineOptions controls the options for one pack quarantine creation. -type PackQuarantineOptions struct{} - -// ObjectQuarantiner creates quarantines for object-wise writes. -type ObjectQuarantiner interface { - BeginObjectQuarantine(opts ObjectQuarantineOptions) (ObjectQuarantine, error) -} - -// PackQuarantiner creates quarantines for pack-wise writes. -type PackQuarantiner interface { - BeginPackQuarantine(opts PackQuarantineOptions) (PackQuarantine, error) -} diff --git a/object/store/writer.go b/object/store/writer.go deleted file mode 100644 index 75433ab3..00000000 --- a/object/store/writer.go +++ /dev/null @@ -1,32 +0,0 @@ -package objectstore - -import ( - "io" - - objectid "codeberg.org/lindenii/furgit/object/id" - objecttype "codeberg.org/lindenii/furgit/object/type" -) - -// ObjectWriter writes individual Git objects. -type ObjectWriter interface { - // WriteReaderContent writes one typed object content stream. - WriteReaderContent(ty objecttype.Type, size int64, src io.Reader) (objectid.ObjectID, error) - - // WriteReaderFull writes one full serialized object stream as "type size\0content". - WriteReaderFull(src io.Reader) (objectid.ObjectID, error) - - // WriteBytesContent writes one typed object content byte slice. - WriteBytesContent(ty objecttype.Type, content []byte) (objectid.ObjectID, error) - - // WriteBytesFull writes one full serialized object byte slice as "type size\0content". - WriteBytesFull(raw []byte) (objectid.ObjectID, error) -} - -// PackWriteOptions controls one pack write operation. -type PackWriteOptions struct{} - -// PackWriter writes Git pack streams. -type PackWriter interface { - // WritePack ingests one pack stream. - WritePack(src io.Reader, opts PackWriteOptions) error -} diff --git a/object/store/writer_object.go b/object/store/writer_object.go new file mode 100644 index 00000000..77ffbbcd --- /dev/null +++ b/object/store/writer_object.go @@ -0,0 +1,37 @@ +package objectstore + +import ( + "io" + + objectid "codeberg.org/lindenii/furgit/object/id" + objecttype "codeberg.org/lindenii/furgit/object/type" +) + +// ObjectWriter writes individual Git objects. +type ObjectWriter interface { + // WriteReaderContent writes one typed object content stream. + WriteReaderContent(ty objecttype.Type, size int64, src io.Reader) (objectid.ObjectID, error) + + // WriteReaderFull writes one full serialized object stream as "type size\0content". + WriteReaderFull(src io.Reader) (objectid.ObjectID, error) + + // WriteBytesContent writes one typed object content byte slice. + WriteBytesContent(ty objecttype.Type, content []byte) (objectid.ObjectID, error) + + // WriteBytesFull writes one full serialized object byte slice as "type size\0content". + WriteBytesFull(raw []byte) (objectid.ObjectID, error) +} + +// ObjectQuarantine represents one quarantined object-wise write. +type ObjectQuarantine interface { + Quarantine + ObjectWriter +} + +// ObjectQuarantineOptions controls the options for one object quarantine creation. +type ObjectQuarantineOptions struct{} + +// ObjectQuarantiner creates quarantines for object-wise writes. +type ObjectQuarantiner interface { + BeginObjectQuarantine(opts ObjectQuarantineOptions) (ObjectQuarantine, error) +} diff --git a/object/store/writer_pack.go b/object/store/writer_pack.go new file mode 100644 index 00000000..25c1e8d9 --- /dev/null +++ b/object/store/writer_pack.go @@ -0,0 +1,26 @@ +package objectstore + +import "io" + +// PackWriteOptions controls one pack write operation. +type PackWriteOptions struct{} + +// PackWriter writes Git pack streams. +type PackWriter interface { + // WritePack ingests one pack stream. + WritePack(src io.Reader, opts PackWriteOptions) error +} + +// PackQuarantine represents one quarantined pack-wise write. +type PackQuarantine interface { + Quarantine + PackWriter +} + +// PackQuarantineOptions controls the options for one pack quarantine creation. +type PackQuarantineOptions struct{} + +// PackQuarantiner creates quarantines for pack-wise writes. +type PackQuarantiner interface { + BeginPackQuarantine(opts PackQuarantineOptions) (PackQuarantine, error) +} -- cgit v1.3.1-10-gc9f91