Skip to content

Remove support for the old writer. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
floitsch wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove support for the old writer. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25d59ae
Remove support for the old writer.
floitsch Feb 15, 2026
f56f400
Close explicitly.
floitsch Feb 15, 2026
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
18 changes: 5 additions & 13 deletions src/tar.toit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 Toitware ApS. All rights reserved.
// Copyright (C) 2026 Toit contributors.
// Use of this source code is governed by an MIT-style license that can be
// found in the package's LICENSE file.

Expand All @@ -14,15 +14,9 @@ class Tar:

/**
Creates a new Tar archiver that writes to the given $writer.

The $writer should be an $io.Writer, but for compatibility reasons, it can also be an
"old-style" writer. The old-style writer is deprecated and will be removed in the future.
*/
constructor writer:
if writer is io.Writer:
writer_ = writer
else:
writer_ = io.Writer.adapt writer
constructor writer/io.Writer:
writer_ = writer

/**
Adds a new "file" to the generated tar-archive.
Expand All @@ -34,15 +28,13 @@ class Tar:
add_ file-name content --permissions=permissions

/**
Closes the tar stream, and invokes 'close' on the writer if $close-writer is
true (the default).
Closes the tar stream, but does not close the writer.
*/
close --close-writer/bool=true:
close:
// TODO(florian): feels heavy to allocate a new array just to write a bunch of zeros.
zero-header := ByteArray 512
writer_.write zero-header
writer_.write zero-header
if close-writer: (writer_ as io.CloseableWriter).close

/**
Adds the given $file-name with its $content to the tar stream.
Expand Down
2 changes: 1 addition & 1 deletion tests/basic-test.toit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 Toitware ApS.
// Copyright (C) 2026 Toit contributors.
// Use of this source code is governed by a Zero-Clause BSD license that can
// be found in the tests/TESTS_LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion tests/long-name-test.toit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 Toitware ApS.
// Copyright (C) 2026 Toit contributors.
// Use of this source code is governed by a Zero-Clause BSD license that can
// be found in the tests/TESTS_LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion tests/permissions-test.toit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 Toitware ApS.
// Copyright (C) 2026 Toit contributors.
// Use of this source code is governed by a Zero-Clause BSD license that can
// be found in the tests/TESTS_LICENSE file.

Expand Down
1 change: 1 addition & 0 deletions tests/utils.toit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ run-tar command flags [generator]:
latch.set result

generator.call to.out
to.close

return latch.get

Expand Down