Use new /file/dir/PATH API endpoint

Replace the Elasticsearch query sending with a call to the new API endpoint.
metacpan · Jun 2, 2017 · c6329e0 · c6329e0
1 parent ed913b7
commit c6329e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/lib/MetaCPAN/Web/Controller/Source.pm b/lib/MetaCPAN/Web/Controller/Source.pm
@@ -40,17 +40,12 @@ sub index : Path : Args {
         );
     }
     if ( $module->{directory} ) {
-        my $files = $c->model('API::File')->dir(@module)->recv;
+        my $files = $c->model('API::File')->dir(@module);
         $c->res->last_modified( $module->{date} );
         $c->stash(
             {
-                template => 'browse.html',
-                files    => [
-                    map { single_valued_arrayref_to_scalar( $_->{fields} ) }
-                        @{ $files->{hits}->{hits} }
-                ],
-                total     => $files->{hits}->{total},
-                took      => $files->{took},
+                template  => 'browse.html',
+                files     => $files,
                 author    => shift @module,
                 release   => shift @module,
                 directory => \@module,

diff --git a/lib/MetaCPAN/Web/Model/API/File.pm b/lib/MetaCPAN/Web/Model/API/File.pm
@@ -13,30 +13,10 @@ sub source {
 }
 
 sub dir {
-    my ( $self, $author, $release, @path ) = @_;
-    $self->request(
-        '/file/_search',
-        {
-            query => {
-                bool => {
-                    must => [
-                        { term => { 'level'   => scalar @path } },
-                        { term => { 'author'  => $author } },
-                        { term => { 'release' => $release } },
-                        {
-                            prefix => {
-                                'path' => join( q{/}, @path, q{} )
-                            }
-                        },
-                    ]
-                },
-            },
-            size   => 999,
-            fields => [
-                qw(name stat.mtime path stat.size directory slop documentation mime)
-            ],
-        }
-    );
+    my ( $self, @path ) = @_;
+    my $path = join '/', @path;
+    my $data = $self->request("/file/dir/$path")->recv;
+    return $data->{dir};
 }
 
 __PACKAGE__->meta->make_immutable;