From 32db7e255f18d8f9514de423bd65264d2090949e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 3 Dec 2020 08:29:37 +0100 Subject: Allow multiple sources per package This patch implements multiple (unnamed) sources per package. This means that a package can have an array of sources. What was adapted to allow multiple sources per package: * Downloads are made in parallel now * The cache structure was changed to /-/.source * The UI was changed to contain the full `Package` struct (as JSON object) in a UI format string Tests were adapted. Signed-off-by: Matthias Beyer --- examples/packages/example_1/pkgA/pkg.toml | 2 +- examples/packages/example_1/pkgB/pkg.toml | 2 +- examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml | 2 +- examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml | 2 +- examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml | 2 +- examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml | 2 +- examples/packages/example_3/pkg.toml | 2 +- examples/packages/example_tmux/pkg.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'examples') diff --git a/examples/packages/example_1/pkgA/pkg.toml b/examples/packages/example_1/pkgA/pkg.toml index cb9a556..d82df02 100644 --- a/examples/packages/example_1/pkgA/pkg.toml +++ b/examples/packages/example_1/pkgA/pkg.toml @@ -4,7 +4,7 @@ version = "1.0.0" [dependencies] runtime = [ "pkgB =1.0.0" ] -[source] +[[sources]] url = "http://somerandomthi.ng/foo/bar.tar.gz" hash.type = "sha1" hash.hash = "23465" diff --git a/examples/packages/example_1/pkgB/pkg.toml b/examples/packages/example_1/pkgB/pkg.toml index 14a062a..8685b5d 100644 --- a/examples/packages/example_1/pkgB/pkg.toml +++ b/examples/packages/example_1/pkgB/pkg.toml @@ -1,7 +1,7 @@ name = "pkgB" version = "1.0.0" -[source] +[[sources]] url = "http://somerandomthi.ng/foo/bar.tar.gz" hash.type = "sha1" hash.hash = "23465" diff --git a/examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml b/examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml index bcb9678..9788036 100644 --- a/examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml +++ b/examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml @@ -1,6 +1,6 @@ version = "1.0.0" -[source] +[[sources]] url = "http://somerandomthi.ng/foo/bar-1.0.0.tar.gz" hash.type = "sha1" hash.hash = "23465" diff --git a/examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml b/examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml index 2eee1df..a46727f 100644 --- a/examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml +++ b/examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml @@ -1,6 +1,6 @@ version = "2.0.0" -[source] +[[sources]] url = "http://somerandomthi.ng/foo/bar-2.0.0.tar.gz" hash.type = "sha1" hash.hash = "23465" diff --git a/examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml b/examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml index c167d09..9e9d3a8 100644 --- a/examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml +++ b/examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml @@ -1,6 +1,6 @@ version = "1.0.0" -[source] +[[sources]] url = "http://somerandomthi.ng/foo/baz-1.0.0.tar.gz" hash.type = "sha1" hash.hash = "23465" diff --git a/examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml b/examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml index 225aebd..2a3990a 100644 --- a/examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml +++ b/examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml @@ -1,6 +1,6 @@ version = "2.0.0" -[source] +[[sources]] url = "http://somerandomthi.ng/foo/baz-2.0.0.tar.gz" hash.type = "sha1" hash.hash = "23465" diff --git a/examples/packages/example_3/pkg.toml b/examples/packages/example_3/pkg.toml index f844921..d399047 100644 --- a/examples/packages/example_3/pkg.toml +++ b/examples/packages/example_3/pkg.toml @@ -4,7 +4,7 @@ version_is_semver = false # no patches by default patches = [] -[source] +[[sources]] url = "https://github.com/user/repo/archive/sources.tar.gz" hash.type = "sha1" hash.hash = "5e8bcaa3c758f84f01935a914e2bbf01309462ae" diff --git a/examples/packages/example_tmux/pkg.toml b/examples/packages/example_tmux/pkg.toml index 7d4119e..beac147 100644 --- a/examples/packages/example_tmux/pkg.toml +++ b/examples/packages/example_tmux/pkg.toml @@ -5,7 +5,7 @@ version_is_semver = false # no patches by default patches = [] -[source] +[[sources]] url = "https://github.com/tmux/tmux/archive/3.1c.tar.gz" hash.type = "sha1" hash.hash = "5e8bcaa3c758f84f01935a914e2bbf01309462ae" -- cgit v1.2.3