added song hashes to API responses

converted API search responses to API format
elliotttate · Jul 11, 2018 · f042ac2 · f042ac2
1 parent 7c74cd3
commit f042ac2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
@@ -125,7 +125,7 @@ public function search(string $type, string $key, SongListComposer $composer)
         }
 
         $parameter = [strtolower($type) => $key];
-        $songs = $composer->search($parameter);
+        $songs = $composer->search($parameter, 0, SongListComposer::DEFAULT_LIMIT, true);
         $total = count($songs);
         return Response::json(['songs' => $songs, 'total' => $total]);
     }

diff --git a/app/SongComposer.php b/app/SongComposer.php
@@ -194,11 +194,13 @@ public function createOrUpdate(array $metadata, string $file): array
                 'upVotesTotal'   => 0,
                 'downVotes'      => 0,
                 'downVotesTotal' => 0,
-                'version'        => $song->details->count(), //@todo fix version if $detailId is specified
-                'createdAt'      => $songDetails->created_at,
-                'linkUrl'        => route('browse.detail', ['key' => $song->id . '-' . $songDetails->id]),
-                'downloadUrl'    => route('download', ['key' => $song->id . '-' . $songDetails->id]),
-                'coverUrl'       => asset("storage/songs/{$song->id}/{$song->id}-{$songDetails->id}.$songDetails->cover"),
+                'version'     => $song->details->count(), //@todo fix version if $detailId is specified
+                'createdAt'   => $songDetails->created_at,
+                'linkUrl'     => route('browse.detail', ['key' => $song->id . '-' . $songDetails->id]),
+                'downloadUrl' => route('download', ['key' => $song->id . '-' . $songDetails->id]),
+                'coverUrl'    => asset("storage/songs/{$song->id}/{$song->id}-{$songDetails->id}.$songDetails->cover"),
+                'hashMd5'     => $songDetails->hash_md5,
+                'hashSha1'    => $songDetails->hash_sha1,
             ]
         ];
     }
@@ -391,6 +393,8 @@ protected function compose(string $key): array
                 'linkUrl'        => route('browse.detail', ['key' => $song->id . '-' . $detail->id]),
                 'downloadUrl'    => route('download', ['key' => $song->id . '-' . $detail->id]),
                 'coverUrl'       => asset("storage/songs/{$song->id}/{$song->id}-{$detail->id}.$detail->cover"),
+                'hashMd5'        => $detail->hash_md5,
+                'hashSha1'       => $detail->hash_sha1,
             ];
         }
 
@@ -476,6 +480,8 @@ protected function convertSongToApiFormat(array $song): array
             'linkUrl'        => $song['version'][$song['key']]['linkUrl'],
             'downloadUrl'    => $song['version'][$song['key']]['downloadUrl'],
             'coverUrl'       => $song['version'][$song['key']]['coverUrl'],
+            'hashMd5'        => $song['version'][$song['key']]['hashMd5'],
+            'hashSha1'       => $song['version'][$song['key']]['hashSha1'],
         ];
     }
 }