grahamc/hydra2 - Change IZ7MTJNRORVGVHG6R4N3NGXPR5O5DQ3ICCZ2XFD74ACFUEDOVG6QC

ListBuilds: Simplify nix channel dispatcher.

We only allow channel/latest anyway, so it really doesn't make sense to explicitly specify this in the PathPart and provide other dispatcher once we have more than just "latest", which greatly simplifies the dispatch tree.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Created by aszlig on April 24, 2015

IZ7MTJNRORVGVHG6R4N3NGXPR5O5DQ3ICCZ2XFD74ACFUEDOVG6QC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 35 [3.1]

B:BD[3.985] → [4.49:118]

sub nix : Chained('get_builds') PathPart('channel') CaptureArgs(1) {

[3.985]

[4.118]

sub nix : Chained('get_builds') PathPart('channel/latest') CaptureArgs(1) {

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 37 [3.1]

B:BD[4.157] → [4.157:289]

B:BD[4.289] → [5.0:186]

B:BD[5.186] → [6.4:160]

B:BD[6.160] → [2.0:74]

∅:D[2.74] → [7.479:603]

∅:D[6.160] → [7.479:603]

B:BD[7.479] → [7.479:603]

∅:D[5.301] → [4.577:587]

∅:D[8.323] → [4.577:587]

∅:D[7.603] → [4.577:587]

B:BD[4.577] → [4.577:587]

∅:D[9.196] → [4.587:602]

B:BD[4.587] → [4.587:602]

B:BD[4.602] → [10.0:61]

∅:D[10.61] → [4.660:702]

B:BD[4.660] → [4.660:702]

    eval {
        if ($channelName eq "latest") {
            $c->stash->{channelName} = $c->stash->{channelBaseName} . "-latest";
            $c->stash->{channelBuilds} = $c->stash->{latestSucceeded}
                ->search_literal("exists (select 1 from buildproducts where build = me.id and type = 'nix-build')")
                ->search({}, { columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
                             , join => ["buildoutputs"]
                             , order_by => ["me.id", "buildoutputs.name"]
                             , '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });
        }
        else {
            notFound($c, "Unknown channel `$channelName'.");
        }
    };
    error($c, $@) if $@;

[4.157]

[11.0]


    $c->stash->{channelName} = $c->stash->{channelBaseName} . "-latest";
    $c->stash->{channelBuilds} = $c->stash->{latestSucceeded}
        ->search_literal("exists (select 1 from buildproducts where build = me.id and type = 'nix-build')")
        ->search({}, { columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
                     , join => ["buildoutputs"]
                     , order_by => ["me.id", "buildoutputs.name"]
                     , '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });