From cbebc254528113dbae71f2014a2db46a291fe2a2 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Mon, 26 Oct 2015 19:33:11 +0000
Subject: [PATCH 01/44] Add cache-related columns to track_files table

---
 ...6_192855_update_track_files_with_cache.php | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 database/migrations/2015_10_26_192855_update_track_files_with_cache.php

diff --git a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
new file mode 100644
index 00000000..c0a51e75
--- /dev/null
+++ b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateTrackFilesWithCache extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('track_files', function (Blueprint $table) {
+            $table->boolean('is_cacheable')->default(false);
+            $table->dateTime('expiration')->nullable();
+            $table->boolean('in_progress')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('track_files', function (Blueprint $table) {
+            $table->dropColumn('is_cacheable');
+            $table->dropColumn('expiration');
+            $table->dropColumn('in_progress');
+        });
+    }
+}

From a9f80fde6ea2fcd3d51a2053f83ad08e63c67a6a Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Mon, 26 Oct 2015 19:47:42 +0000
Subject: [PATCH 02/44] Add console commands

---
 app/Console/Commands/ClearTrackCache.php   | 111 +++++++++++
 app/Console/Commands/RebuildTrackCache.php | 210 +++++++++++++++++++++
 app/Console/Kernel.php                     |   2 +
 3 files changed, 323 insertions(+)
 create mode 100644 app/Console/Commands/ClearTrackCache.php
 create mode 100644 app/Console/Commands/RebuildTrackCache.php

diff --git a/app/Console/Commands/ClearTrackCache.php b/app/Console/Commands/ClearTrackCache.php
new file mode 100644
index 00000000..ab534a13
--- /dev/null
+++ b/app/Console/Commands/ClearTrackCache.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Console\Commands;
+
+use Carbon\Carbon;
+use File;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Poniverse\Ponyfm\TrackFile;
+
+class ClearTrackCache extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'track-cache:clear
+                            [--tracks=expired : Clear only [expired] (default) or [all] cached tracks.]
+                            [--force : Skip all prompts.]';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Clears cached tracks. Defaults to expired tracks. Usage: php artisan track-cache:clear [--tracks=expired|all]';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if ($this->option('tracks') == 'all') {
+            // Get all cacheable tracks
+            $trackFiles = TrackFile::where('is_cacheable', true)->get();
+        } else {
+            // Get all expired tracks
+            $trackFiles = TrackFile::where('is_cacheable', true)
+                ->where('expiration', '<=', Carbon::now())
+                ->get();
+
+        }
+
+        // Delete above tracks
+        if (count($trackFiles) === 0) {
+            $this->info('No tracks found. Exiting.');
+        } else {
+
+            if ($this->option('force') || $this->confirm(count($trackFiles) . ' tracks found. Proceed to delete? [y|N]', false)) {
+
+                $count = 0;
+
+                foreach ($trackFiles as $trackFile) {
+
+                    // Set expiration to null (so can be re-cached upon request)
+                    $trackFile->expiration = null;
+                    $trackFile->update();
+
+                    // Delete files if exists
+                    if (File::exists($trackFile->getFile())) {
+                        $count++;
+                        File::delete($trackFile->getFile());
+
+                        // Remove the cached file sizes for main, trackfile and format
+                        Cache::forget($trackFile->getCacheKey('filesize'));
+                        Cache::forget($trackFile->track()->getCacheKey('filesize-' . $trackFile->format));
+                        Cache::forget($trackFile->track()->album()->getCacheKey('filesize-' . $trackFile->format));
+
+                        $this->info('Deleted ' . $trackFile->getFile());
+                    }
+
+                }
+                $this->info($count . ' files deleted. Deletion complete. Exiting.');
+            } else {
+                $this->info('Deletion cancelled. Exiting.');
+            }
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
new file mode 100644
index 00000000..e2fc36e5
--- /dev/null
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -0,0 +1,210 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Console\Commands;
+
+use Illuminate\Console\Command;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\TrackFile;
+use Symfony\Component\HttpFoundation\File\File;
+
+class RebuildTrackCache extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'track-cache:rebuild';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Rebuilds the track cache for when $CacheableFormats is changed. Deletes cacheable files and encodes missing files which are not cacheable.';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->info('This will run \'php artisan down\' if you proceed and \'php artisan up\' when complete.');
+
+        if ($this->option('force') || $this->confirm('Are you sure you want to delete all to-be-cached files and encode missing non-cached files? [y|N]',
+                false)
+        ) {
+
+            $this->call('down');
+
+            //==========================================================================================================
+            // Delete previously cached tracks
+            //==========================================================================================================
+
+            // Find files which are cacheable and NOT master
+            $trackFiles = TrackFile::where('is_cacheable', true)
+                ->where('is_master', false)
+                ->get();
+
+            // Delete above files
+            if (count($trackFiles) == 0) {
+                $this->info('No tracks found. Continuing.');
+            } else {
+                $this->info(count($trackFiles) . ' tracks found.');
+                $count = 0;
+
+                foreach ($trackFiles as $trackFile) {
+                    // Clear expiration so will be re-cached on next request
+                    $trackFile->expiration = null;
+                    $trackFile->update();
+
+                    // Delete files
+                    if (File::exists($trackFile->getFile())) {
+                        $count++;
+                        File::delete($trackFile->getFile());
+                        $this->info('Deleted ' . $trackFile->getFile());
+                    }
+                }
+
+                $this->info($count . ' files deleted. Deletion complete. Continuing.');
+            }
+
+            //==========================================================================================================
+            // Update the database entries for cacheable files - non-cacheable to cacheable
+            //==========================================================================================================
+
+            $this->info('--- Step 2/4 - Updating is_cacheable entries in database. ---');
+
+            // Find files which are meant to be cacheable and NOT master, but currently not cacheable
+            $trackFiles = TrackFile::where('is_cacheable', false)
+                ->whereIn('format', array_keys(Track::$CacheableFormats))
+                ->where('is_master', false)
+                ->get();
+
+            $formats = [];
+
+            // Set above files to cacheable in the database
+            foreach ($trackFiles as $trackFile) {
+                // Let user know which formats, previously not cached, were made cacheable
+                $formats[] = $trackFile->format;
+
+                $trackFile->expiration = null;
+                $trackFile->is_cacheable = true;
+                $trackFile->update();
+            }
+
+            $this->info('Format(s) set from non-cacheable to cacheable: ' . implode(' ', array_unique($formats)));
+            $this->info(count($trackFiles) . ' non-cacheable tracks set to cacheable.');
+
+            //==========================================================================================================
+            // Update the database entries for cacheable files - cacheable to non-cacheable
+            //==========================================================================================================
+
+            // Find files which are NOT meant to be cacheable, but currently cacheable
+            $trackFiles = TrackFile::where('is_cacheable', true)
+                ->whereNotIn('format', array_keys(Track::$CacheableFormats))
+                ->get();
+
+            $formats = [];
+
+            // Set above files to non-cacheable in the database
+            foreach ($trackFiles as $trackFile) {
+                // Let user know which formats, previously not cached, were made cacheable
+                $formats[] = $trackFile->format;
+
+                $trackFile->expiration = null;
+                $trackFile->is_cacheable = false;
+                $trackFile->update();
+            }
+
+            $this->info('Format(s) set from cacheable to non-cacheable: ' . implode(' ', array_unique($formats)));
+            $this->info(count($trackFiles) . ' cacheable tracks set to non-cacheable.');
+
+            //==========================================================================================================
+            // Delete files which have now been marked as cacheable
+            //==========================================================================================================
+
+            $this->info('--- Step 3/4 - Deleting now-cacheable files. ---');
+
+            // Find files which are cacheable and NOT master
+            $trackFiles = TrackFile::whereIn('format', array_keys(Track::$CacheableFormats))
+                ->where('is_master', false)
+                ->get();
+
+            // Delete above files
+            if (count($trackFiles) == 0) {
+                $this->info('No tracks to delete found. Continuing.');
+            } else {
+                $count = 0;
+                foreach ($trackFiles as $trackFile) {
+                    // Delete files if files exist; double-check that they are NOT master files
+                    if (File::exists($trackFile->getFile()) && $trackFile->is_master == false) {
+                        $count++;
+                        File::delete($trackFile->getFile());
+                        $this->info('Deleted ' . $trackFile->getFile());
+                    }
+                }
+                $this->info(sprintf('%d files deleted out of %d tracks. Continuing.', $count, count($trackFiles)));
+            }
+
+            //==========================================================================================================
+            // Encode missing (i.e., now non-cacheable) files
+            //==========================================================================================================
+
+            $this->info('--- Step 4/4 - Encoding missing files. ---');
+
+            // Get non-cacheable files
+            $trackFiles = TrackFile::where('is_cacheable', false)->get();
+
+            // Record the above files which do not exist (i.e., have not been encoded yet)
+            $trackFileIds = [];
+            $count = 0;
+            foreach ($trackFiles as $trackFile) {
+                if (!File::exists($trackFile->getFile())) {
+                    $count++;
+                    $trackFileIds[] = $trackFile->id;
+                }
+            }
+
+            // Encode recorded files
+            $encodeTrackFileCommand = new EncodeTrackFileCommand($trackFileIds);
+            $encodeTrackFileCommand->execute();
+
+            $this->info($count . ' tracks encoded.');
+
+            $this->call('up');
+            $this->info('Rebuild complete. Exiting.');
+
+        } else {
+            $this->info('Rebuild cancelled. Exiting.');
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 94c282af..6f76ff2b 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -39,6 +39,8 @@ class Kernel extends ConsoleKernel
         \Poniverse\Ponyfm\Console\Commands\FixYearZeroLogs::class,
         \Poniverse\Ponyfm\Console\Commands\BootstrapLocalEnvironment::class,
         \Poniverse\Ponyfm\Console\Commands\PoniverseApiSetup::class,
+        \Poniverse\Ponyfm\Console\Commands\ClearTrackCache::class,
+        \Poniverse\Ponyfm\Console\Commands\RebuildTrackCache::class,
     ];
 
     /**

From 9470faaaa290cdefe1c1997aaf62e6bc33f4b246 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Mon, 26 Oct 2015 19:48:55 +0000
Subject: [PATCH 03/44] Add $CacheableFormats to Track.php

---
 app/Track.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/Track.php b/app/Track.php
index 027ed6a3..7e06db09 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -93,6 +93,27 @@ class Track extends Model
         ],
     ];
 
+    public static $CacheableFormats = [
+        'OGG Vorbis' => [
+            'index' => 2,
+            'is_lossless' => false,
+            'extension' => 'ogg',
+            'tag_format' => 'vorbiscomment',
+            'tag_method' => 'updateTagsWithGetId3',
+            'mime_type' => 'audio/ogg',
+            'command' => 'ffmpeg 2>&1 -y -i {$source} -acodec libvorbis -aq 7 -f ogg {$target}'
+        ],
+        'ALAC' => [
+            'index' => 4,
+            'is_lossless' => true,
+            'extension' => 'alac.m4a',
+            'tag_format' => 'AtomicParsley',
+            'tag_method' => 'updateTagsWithAtomicParsley',
+            'mime_type' => 'audio/mp4',
+            'command' => 'ffmpeg 2>&1 -y -i {$source} -acodec alac {$target}'
+        ],
+    ];
+
     public static function summary()
     {
         return self::select('tracks.id', 'title', 'user_id', 'slug', 'is_vocal', 'is_explicit', 'created_at', 'published_at',

From fdb95560e7f811c4f9acaaaabfb50c01488fd2c2 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Mon, 26 Oct 2015 19:50:58 +0000
Subject: [PATCH 04/44] Add --force option to RebuildTrackCache

---
 app/Console/Commands/RebuildTrackCache.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index e2fc36e5..86e51f22 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -32,7 +32,8 @@ class RebuildTrackCache extends Command
      *
      * @var string
      */
-    protected $signature = 'track-cache:rebuild';
+    protected $signature = 'track-cache:rebuild
+                            [--force : Skip all prompts.]';
 
     /**
      * The console command description.

From 8f76b4d59dffffdb56af8293a6c94bf3dd0dc9d7 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Mon, 26 Oct 2015 20:55:15 +0000
Subject: [PATCH 05/44] Add cache duration to ponyfm.php config

---
 config/ponyfm.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/config/ponyfm.php b/config/ponyfm.php
index add3e98f..7ae9f250 100644
--- a/config/ponyfm.php
+++ b/config/ponyfm.php
@@ -54,4 +54,15 @@ return [
 
     'use_powered_by_footer' => env('USE_POWERED_BY_FOOTER', true),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Duration
+    |--------------------------------------------------------------------------
+    |
+    | Duration in minutes for tracks to be stored in cache.
+    |
+    */
+
+    'cache_duration' => 1440,
+
 ];

From 5380d0b45a22cabe1e9482a5e21091894ab5c6ee Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Tue, 27 Oct 2015 15:31:14 +0000
Subject: [PATCH 06/44] Add loading.gif

---
 public/images/loading.gif | Bin 0 -> 7771 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/images/loading.gif

diff --git a/public/images/loading.gif b/public/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..724eacb53fedbc037cdc380e383cbd86e5ab3cd8
GIT binary patch
literal 7771
zcmd^^S5%XUx`zKifDjTyq$f1#2pEt$f&$V76p-qGp@+_Z(m{gs5{mRDCA1*D_s~I_
zf<gpDkfMx;h@hZ2o-j^v_C9N!bFue2XYI*FF0%f+C-3)u&-ZI;Ysf2DO9A3Q0|0#e
z`t{>Rc<$`S)UJ)dE>)MRCEMJ=kKU3%>f~EhNn4TlLBJdM^)d1{`NR8_PG9|+(Iu6u
z>QWLYO3?97hhSPT00+bXfD(`bL;wK%wRTjyvdgS!qT%Z@OZ*yjzLg}eW?+(ls8PgK
zS9h+dAU7eR+9b2`j$KplS;%;uuI5#@c5A5R&?_g=S5Shkt4YpEK!>rKk?zpJWc-0#
zp*wDY1)K{q6Jxt^gVT=<;TU`y2$c=zj<gJliM13xhs@xDfWZNl!9RJ$3n8H;rO>PX
z*}3_*gW}R~r5X5gRz%KyihDt+brI#QZT*mD=E1%^V9Zjd#~+T&LGkDMp6SiWb2P$L
zg839oK|@R<*$azPgvu2f6=NDO)!rVd6|%oy{01bx!?D{{r}7s01J^Y1Fi^8B?1Y0O
z%!=-j2XB&#O!_7QwY<n0&OH282G7f*5=x<C7@{HojX*_60Q%+DQZazQnfKW7^=%+i
z@`CfyfD^`2(3(FN?TijBtqBW=XK9xfN7CJ6hDooN(yz(+n!aUQKG5JU5!ULxkcCRW
zpP^&_$YkHqPTUAb`9kMmTrFWrOmLo_6yUS5&<)+pKBd@-O}r6gDLABqt;2RjarShH
zT{4=E2~%*naK1Ja6WfStWVZYipD>faj}bUbM`)7jI0HsMvz*;tjEveSiE5Gbl=C>_
zWErwJ(Jg!Oe`0H@;-=!{j?QKdBk^bkWtKS`xzde!1wX&9az;gWCm{M>!k`$7KPr`R
zfC(b2Uo57eXIy2f<}>!Dnuw;RJTp6lcc7!Fq84L$t+rr>8+(cN@dI3}Jwt9g`M`j1
z6A4*l3O521=L|~}MMCrPp;3Hba41CvPFw_%pORa^iYP8AOH5*`L>9NVx8Cl=CYY!;
zd!4NVOAF$IISL^47_@HcRIz}f1*nF(^-0O}!0jh<H0owFc&|ykIMwzxVHG5~!C~`u
zXQB?W@_2VIpmn|6xM1O&0}n0>7!lJ%NmHLRY|y}IT`~f8;A{`yJV>w|>DU0l<gw~u
z09AN-Cxxgn-kEpQOiX0ijsc`<w)?p}X)#9|?nN5NYB0QLmLfd4!25{5H|z+vM4^qV
zprWK~aQ^hjXf2X*90nVSy^_u7fB8meNvO<g@O=z^sR)uzhpcmdj+@{$#Z5PzYK`V}
zG3i71NytU$2HxU(F>vQS!2;I$PGi(h;4@{w3Tk6G=Hw<P;Ony1S9FFA#USl|XXd(5
zlqbBS<`uTW<VJJw!v5<gmG-xZ!=EpKzt1WKIjf?7&Fa6Hr?<&Bp4`ZoXm1mk4~~qK
z2MJBjfJQMRFp18v6cI>9Oj;HzIlA!_`N`r%=_N5`UKN$->Xf@|#Yh5?*xlS04-A{A
zc6yyf5TpewgE_KVS~23aT$58EGS()(CvzmKvGNuHNix<-uO}6dm;0}}o^7f9Xa@dp
zsykQj)Vk|4Y;X?HB;TU4q^$FEC+A}$UK%NBP>t}40|PJ41Q^+Zvt1=-$RZXYH}}Z@
z<72QRohh66*i`BhjVmu0OGC4)T^Zwr-|5jPpS=TF;lFvk$bHFYPo@2#RXL((cQeT7
zB)kCmQkGGM(C}KK65VGLVId2puchW^W2@L%Y7R174oW!Vi^qDKdepx$+ISt_7IIz6
z+@(m2x;6Mz3rtsgy*<jSmy1h*r+Otv2zB`&p5$Sf%6TDaWAU)@9)lB~&@V^x_nW8l
zgygE;aL7F$Y;t?<@MU4!WeyG#HsxBpqtw*I_gz>i0T6H&IP(Ww*3E>D9;y;5yNY08
z6NvR4<c>kMlTy_dVz|+=hSJ0)lk|?E`?0e&|F%^b-cf`BlRe00_^HsO3Uc3Pj4HSX
zHYAf9p*~jR%~5MseroG9yF{PyrVrqZ_FzLqadTj9!hkSiaV`#MY8o_xIrc`p6D%nv
zE$VItI~WYf@kz)ROUd9Utt*A#vmgx>-bu+>61CuS{AGcRJ^i<F#wwl7b^Ma%pr%ue
zL*<TQRqQ=eG-}o~Wh_rx$aKdih#=H+^%q$+>#z1US4*EgAEX8EKi=JOb~T%$zjE)~
zo*-|1Z$h5j9l0cHKF2}L{;)t3d4e2T8S6YhX~;GvXGezvgP>q@r*%UuCO%Fs^qn<3
z9gtXWXSlyh-gp+m)!}uyw`0_$gZxdNhSR+n0k1AdcFND_4U|F54^EL9aw4-#n^cwL
zWGWECj79aYFa=mpA}O9rCJtO>kw!h={>JPIL92a`;lMya`R(;)I5nN_16=%aS@g%#
zCPyt`GpIa-HGO<GaWODG2EN^TxZ^POVJN0P>FG_Y>9Ui%+MgfGY)!;`*)_=hDC5-C
zW^}nwu~%l}sr9XniMSuBo^D*cdZ`6;>r*)7&-_x7i}&nz`8`JbHGw4_Pn~c2Ti41(
zT*Z*P7V~@8D*x8C!}@N7<E|}t{H<$Ue(T!mKf3meJY}sJs{00#3lYxE;TRMG+?M6x
zfF>nFud+j|0%PMWMeihsC*CFVO}7mC$t!^qa+jmHrue=uV>P}sBrragowo_ahi~Yr
zi7E@s>0oIB^GTS33YqF50~ElVrOxPdH%MH?nFjx$s@XAzkXAfFv#h$xJoC83k!s=H
z>!ml!=FZ>`A50pvX;8~NrdtQvfwuii#i~;6!Nr#fshhoLy2q1RJ>myls2<b6S|vsD
z_?!;~4UbC~0H{(&jtqB~L{rE2ILq%4qsH<n9H^!IrS47UaRgB-3wa4Y%6ZmVM-nO2
z2=k^2CWU8vImU^>+;SIghV#+a?$_&sT2BgeG)ONEAkk=5QWe{x4!q82d$FAn2JD5I
zUehP=uF0Z!7*VT3A4c*YcC--IhH>iC_J`6QlMiwcN=u6E)i#><PF^=L4v@Btj4%x%
zXvx<)%+<VJQLwal??7@3rIA%WYPKA;)4z^}`Q6$&(RWt5<ukI~T~V{%W|#r=C+Op)
z>z|e?^c}EWTLdN=skwRDNs)Qx!BVLht7_ddWu$J@i+#oswVm1@PG0Qnm5hPW-+O4~
zamkn>&kQyt%-~ru>yjxY(J>LNwm4>3<M>v})+1dgOBBh;1@Q<3=;&Y$o@h2CG&u!|
zV@7yH#{zLmqA6iXsfiH*(J&y#UYZAzTo6{oLLS+8iqgQ`%J5V~V^2?&&*_FH`__uQ
z@PR=Ifu{cM#*7g{M{y6ovK6RKrmMH5+}?1Gb$Xsg`$w9l`sHR1TkZ*v*lUiTz*I+-
zeckWwKYE`=AHxZ@3)uNAM`wM}n*?D>HNp<J${_-bp=vHg9C77yT=Z-^Q}Hk-#y1t`
zgnPBZ0063$<rJAx&m=q}X}u{0sDh+jPAkUf3!S1@G6tnlyc9g6!rAn+wU19FKPrQV
zUM#&{pHp#nxBRr>we=GOcdiT94)FO(Y<e7fMlxQZpjy`}8cNw$+$|{i;EQf(o<buN
zgXe|^3M{qHXhUCem1Y=9<}@-QPx!cIJU3%b0~sIb%6o3K`zBzN9BtULEVHSK-L(T=
zqk1y0EL6Gtu<|ogw+LoKN#2ibHOYQz$TA1wwSuLY$-lpPi@KNP+H-^JdEC+8g&H8w
z?SCre|5Vl?y9Zx#A_};BlpCQBDu}j=Iq)t~6@DHAJ@sq!vox>+M~z5n+=s{Psc8P=
zP~%6WFKL^{-rdZ+@5)|K7@8%G$X3g^OG}ea2+_gX-c2iro_GCmC7C#p8Im!sARc+l
z+T^{NfU5L*A}^#$L9KjW@LC`$TbgI)(i%WX&B2D6Hley!d^oamjz_8{yo)f>O$9b#
zU+FjndH+PR5^S5kOV2v1i1vzqVDQv#!}XwUc}h@m<LN%z+trSI14vP8cHir{+TrR#
zm+B_V5${{JD{j5}9{mIT0}}3YD2J6RTmhbXIX^x>&#P}M^kV0)``586{lotC?{p<a
zB<^=xA`4P>4q1?X7be~uTvi?{qM!&L6i4=`yy}9sn)}SHg#mRydSewFS%Bj2@o#A(
z0(}%Z167c=V@2v@YOXGFlr4*BB^^6b;rQ^f71d+^S@6ay4(FZ2GcB`_!yVoSR2a~j
zKBb@IuG_LBil;u{CMG`CXDBB>GHD~3hwUd-I0ks|3!Kffct&3L{VVty=@EJV;!PVl
zvXQc?O5LCjm3&dJ#ps0DBaM6Nu0LQQ1X!e$@=ss&SC^}QC?eT=9`RLdLYTlPVi?ok
z2S0z>QvfG+D3*K_wIhO$qD)X!IH(TACR4+-P$>1dp;mL*&bFJrp-WvC7FohBKUwXd
zjezsb&W~VhX+4J2Cj;evvadjkyybLi-9fVx6d&nnS)X%CDSBszGxdA#q}p<3O(s6$
zt*t5z$YD9iPu5esEpZA}9i;GjW9%z7`nwJ6KU9TtsrKq#zTe;bX2Q-(qyk@h&J#|{
zpSp^T3aJ~;-3TjD<&6)&7<mdQF(!v5ww<LJJQM*-4Uwq=P+@a+gQ<4i=ZoS47&29m
zjzxEP)@4C9J{ggfaVLypVXV}NhlFI}SZaW}{ljb)T!bOVBF_(ScB8^4V*5es#hRnU
zlX$Cp(tgD?SS-#VxLi6g$@wDR6_QB+ov(Na=%%=VaW)l}Xch$e+*D}h+1J6|W}t<f
zb3(@^*61(@J5$`Cq$XL>Cm&8))1^MOD7vL5^D{2gQqE%0Uux@Nieru2XO3;BXWSQ7
zeVmzE!4H#LI5Z`j<s<$wqyL*D$G=#d{_jOtbPX{5U4%(OnzfieL^$CO5$+?4@UOlE
zKq2P-RM!YvPgGOt%%&e`hftU`uYEM&ZIesUrS?lT(#p)B6)?zcS+${Xdb4Q!a|SQ#
zpqz(bXC-rjHi(isK!PfuU|jj+!J^VU<ije7-+({Y4INsw*yO`!nHFZ_{;X5s+J^DI
z&j9h-ZJKbU4uiU-h;jN3txmJ~<#66C=$0tfORv*<wW*%RpTd4L<4fxHA_@5UVRWOj
z)H4gIEt1#!M-CkvAERb4<)5knmMv?1e+B-_$-k^we_tQQQc1af^Whb6-0;j_d^nVR
z=pggW@)wxVW)^{SVfqK{fdC3jWScgsXh4qBt8-kIyidEuwEHhS(%h5?EObA5(DEKm
zFAeo&XG1Gj8sN`gq^LKo85~KrH_*{TsE4U$*}c(`Ldn+rm}Ydi556PkPR|;=8k@Z!
zG-}ZraA|+PgQR9bm-vOt9hD_@nrL*1A>_J`_{*03mOMYdjGLGH%6M0|LJMUUJL-%+
zo1cFg>O^aM_^G$^qqzHWUzDlh++nL1!$j`|)834l_nVi0(Tn+RFn?3yKYRD@rp9)j
zzpL@U|3;0E3c!qNce~u+Pd7>4UaU%5)G!EHjp0-mpE3}(gpKW{+&LVUc8pGFf+#s@
zZm!2nS(D;#Olr7Bn27f`+Z1Z?bj;olZ+EeN@r-fM72R{|O{{BW>ip6b@6A%U*l3v<
zT?k*4mhRIedz(aFIbyqi{ai%mYGfoV^9mKEooQ73&!29&PB$qPSf2ij*`~g=jx+g!
zpnO^PDi)Eb)8Y5sLF=0k|9O1=I|*?wP4l^5h4`(0f(zB;cS4+cmGAfpZ4)Bm@4>9&
z@QMEM==5$0kcHLFAI~rnqT!afE3Cl(*g?)i?54?93cya(LnvtMA4IMQQlj~a?4oSr
zy8=wz*ccRu0JQ3g;LT_2#ei9|`}0z1#uhBL-QV2CazXZmm4*2)HfbH1p6E+zCDXg-
zz3P@V!s+f6XsGUj`)-xlIDGbF)-Pw7^|4pX+}pTPp<Z2TkSJxP$fz7>uwooxyV$%i
z`{s*+*!H+P-7GcN=jK=0<6pwW^(cRc{Y&-!eO0)3ME-Xb=Hx1${$7PgG?d9V%WrxF
zP2J3_O(m|{Gl2{-WEGYWx~rlQL;(+=wV}RBR^bCPL2Oe*L@r}rg%=?roYrkfc)p1i
zQG2w=gd)xoN6SB;GY9!<vB{ZyG_{<FeM~nk^>*`CuWZeAru`R&Y&PgnbbBSo>#i)r
zcM(H&K1vdbS;qFt8JZ4}Vk%ya0fLcfljrBR9s04dhDk`XDwhSgE_ZkFd2iB4?b|ik
zt?OLN%bl8B+m5Us-#zPG2&p=cX!n#n>Qnn}M1Qm3Ka>3HYoz~F3;u_T$9I@H;($lr
zV~*DR2h6VMweK-2S^tT-c4lV2PgS3G<(k41imY%#G}HQgIQ*jA31fCY!zr%#dPZ2#
zGkg9G3(kGqM%?)V2}C31_7H}yT!WI5?@O~-sQk`os{2{#U)o#iY?&H#n5xlP_2KR5
zR1H#+TRS7feE&#zf`1bE^8RQS54$eSGV6V+nh-qPxZ1WWNbE)qg}!5VvZuQk+}Xmm
zKBhVE<DPzRZG-*vUnn2%(ZYY+sQ>LR3;(|eupgFX@(%$HJAwH+LJezu<b*8s-=p^0
z@~gc}4)gH=Q_4#GSb#@gtlIx3z+xq20p{Ne7tzzk7w*Qo+ZDc7O#t`rnr9nG3mD>A
zmZA~YiNupw(VrG2cQ&|H5e`!qkeIbmFeTq}?M6u+iMgmB8kBo;d@D6C2O}n`+KWId
z-4~+O^^bfB5yK9A+#0&<cMXP^xP;sncJs7)*za1gXt!07>hBw@@@}=b$&<=xBQ)Hu
e*I=HuJ7Hvw&bKm!`kMR7O7w?%FSC&0p8qf2jCzy+

literal 0
HcmV?d00001


From 097073464863d8352fafb397259cb4cd74ec091c Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Tue, 27 Oct 2015 16:21:03 +0000
Subject: [PATCH 07/44] Update UploadTrackCommand with selective uploading
 using Process

---
 app/Commands/UploadTrackCommand.php | 34 +++++++++++++++--------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index 3432feb8..9e170705 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -26,6 +26,8 @@ use AudioCache;
 use File;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+use Symfony\Component\Process\Process;
 
 class UploadTrackCommand extends CommandBase
 {
@@ -94,8 +96,6 @@ class UploadTrackCommand extends CommandBase
             $source = $trackFile->getPathname();
             $index = 0;
 
-            $processes = [];
-
             // Lossy uploads need to be identified and set as the master file
             // without being re-encoded.
             $audioObject = AudioCache::get($source);
@@ -136,29 +136,31 @@ class UploadTrackCommand extends CommandBase
                 $trackFile = new TrackFile();
                 $trackFile->is_master = $name === 'FLAC' ? true : false;
                 $trackFile->format = $name;
+                if (array_key_exists($name, Track::$CacheableFormats) && $trackFile->is_master == false) {
+                    $trackFile->is_cacheable = true;
+                } else {
+                    $trackFile->is_cacheable = false;
+                }
                 $track->trackFiles()->save($trackFile);
 
-                $target = $destination . '/' . $trackFile->getFilename(); //$track->getFilenameFor($name);
+                if ($trackFile->is_cacheable == false) {
+                    $target = $destination . '/' . $trackFile->getFilename();
 
-                $command = $format['command'];
-                $command = str_replace('{$source}', '"' . $source . '"', $command);
-                $command = str_replace('{$target}', '"' . $target . '"', $command);
+                    $command = $format['command'];
+                    $command = str_replace('{$source}', '"' . $source . '"', $command);
+                    $command = str_replace('{$target}', '"' . $target . '"', $command);
 
-                Log::info('Encoding ' . $track->id . ' into ' . $target);
-                $this->notify('Encoding ' . $name, $index / count(Track::$Formats) * 100);
+                    Log::info('Encoding ' . $track->id . ' into ' . $target);
+                    $this->notify('Encoding ' . $name, $index / count(Track::$Formats) * 100);
 
-                $pipes = [];
-                $proc = proc_open($command, [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'a']], $pipes);
-                $processes[] = $proc;
-            }
-
-            foreach ($processes as $proc) {
-                proc_close($proc);
+                    $process = new Process($command);
+                    $process->mustRun();
+                }
             }
 
             $track->updateTags();
 
-        } catch (\Exception $e) {
+        } catch (ProcessFailedException $e) {
             $track->delete();
             throw $e;
         }

From 628b6f5f86f66ca73418532df94d964d43375815 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Tue, 27 Oct 2015 16:35:04 +0000
Subject: [PATCH 08/44] Update migration -> change default of in_progress to
 false

---
 .../2015_10_26_192855_update_track_files_with_cache.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
index c0a51e75..3bc34189 100644
--- a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
+++ b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
@@ -32,8 +32,8 @@ class UpdateTrackFilesWithCache extends Migration
     {
         Schema::table('track_files', function (Blueprint $table) {
             $table->boolean('is_cacheable')->default(false);
+            $table->boolean('in_progress')->default(false);
             $table->dateTime('expiration')->nullable();
-            $table->boolean('in_progress')->nullable();
         });
     }
 

From c651c44d34c7d760a0d1303550fdccfdd9e8d2c9 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Tue, 27 Oct 2015 17:20:43 +0000
Subject: [PATCH 09/44] Add EncodeTrackFile job

---
 app/Jobs/EncodeTrackFile.php | 128 +++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 app/Jobs/EncodeTrackFile.php

diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
new file mode 100644
index 00000000..60b3953d
--- /dev/null
+++ b/app/Jobs/EncodeTrackFile.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Jobs;
+
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Log;
+use OAuth2\Exception;
+use Poniverse\Ponyfm\Jobs\Job;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Bus\SelfHandling;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\TrackFile;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+use Symfony\Component\Process\Process;
+
+class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
+{
+    use InteractsWithQueue, SerializesModels;
+    /**
+     * @var TrackFile
+     */
+    private $trackFile;
+    /**
+     * @var
+     */
+    private $isExpirable;
+
+    /**
+     * Create a new job instance.
+     * @param TrackFile $trackFile
+     * @param $isExpirable
+     */
+    public function __construct(TrackFile $trackFile, $isExpirable)
+    {
+        $this->trackFile = $trackFile;
+        $this->isExpirable = $isExpirable;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        // Start the job
+        $this->trackFile->in_progress = true;
+        $this->trackFile->update();
+
+        // Assign the source to the track's master file
+        $source = TrackFile::where('track_id', $this->trackFile->track_id)
+            ->where('is_master', true)
+            ->first()
+            ->getFile();
+
+        // Assign the target
+        $destination = $this->trackFile->track()->getDirectory();
+        $this->trackFile->track()->ensureDirectoryExists();
+        $target = $destination . '/' . $this->trackFile->getFilename();
+
+        // Prepare the command
+        $format = Track::$Formats[$this->trackFile->format];
+        $command = $format['command'];
+        $command = str_replace('{$source}', '"' . $source . '"', $command);
+        $command = str_replace('{$target}', '"' . $target . '"', $command);
+
+        Log::info('Encoding track file ' . $this->trackFile->id . ' into ' . $target);
+
+        // Start a synchronous process to encode the file
+        $process = new Process($command);
+        try {
+            $process->mustRun();
+        } catch (ProcessFailedException $e) {
+            Log::error('An exception occured in the encoding process for track file ' . $this->trackFile->id . ' - ' . $e->getMessage());
+            // Ensure queue fails
+            throw $e;
+        } finally {
+            Log::info($process->getOutput());
+        }
+
+        // Update the tags of the track
+        $this->trackFile->track()->updateTags();
+
+        // Insert the expiration time for cached tracks
+        if ($this->isExpirable) {
+            $this->trackFile->expiration = Carbon::now()->addMinutes(Config::get('ponyfm.cache_duration'));
+            $this->trackFile->update();
+        }
+
+        // Complete the job
+        $this->trackFile->in_progress = false;
+        $this->trackFile->update();
+
+    }
+
+    /**
+     * Handle a job failure.
+     *
+     * @return void
+     */
+    public function failed()
+    {
+        $this->trackFile->in_progress = false;
+        $this->trackFile->expiration = null;
+        $this->trackFile->update();
+    }
+}

From 683aa568e9aa07cc080a027b20f851ec3116cf7f Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Tue, 27 Oct 2015 17:21:14 +0000
Subject: [PATCH 10/44] Revert to catch Exception in UploadTrackCommand

---
 app/Commands/UploadTrackCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index 9e170705..0679352e 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -160,7 +160,7 @@ class UploadTrackCommand extends CommandBase
 
             $track->updateTags();
 
-        } catch (ProcessFailedException $e) {
+        } catch (\Exception $e) {
             $track->delete();
             throw $e;
         }

From 43c45adece2d014e49634e82a6f713bbf4034509 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Tue, 27 Oct 2015 17:29:51 +0000
Subject: [PATCH 11/44] Fix options and imports for commands

---
 app/Console/Commands/ClearTrackCache.php   |  4 ++--
 app/Console/Commands/RebuildTrackCache.php | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Console/Commands/ClearTrackCache.php b/app/Console/Commands/ClearTrackCache.php
index ab534a13..7ac592ee 100644
--- a/app/Console/Commands/ClearTrackCache.php
+++ b/app/Console/Commands/ClearTrackCache.php
@@ -34,8 +34,8 @@ class ClearTrackCache extends Command
      * @var string
      */
     protected $signature = 'track-cache:clear
-                            [--tracks=expired : Clear only [expired] (default) or [all] cached tracks.]
-                            [--force : Skip all prompts.]';
+                            {--tracks=expired : Clear only [expired] (default) or [all] cached tracks.}
+                            {--force : Skip all prompts.}';
 
     /**
      * The console command description.
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index 86e51f22..ef5d5582 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -20,20 +20,25 @@
 
 namespace Poniverse\Ponyfm\Console\Commands;
 
+use File;
 use Illuminate\Console\Command;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\Track;
 use Poniverse\Ponyfm\TrackFile;
-use Symfony\Component\HttpFoundation\File\File;
 
 class RebuildTrackCache extends Command
 {
+
+    use DispatchesJobs;
+
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'track-cache:rebuild
-                            [--force : Skip all prompts.]';
+                            {--force : Skip all prompts.}';
 
     /**
      * The console command description.
@@ -186,18 +191,19 @@ class RebuildTrackCache extends Command
             $trackFiles = TrackFile::where('is_cacheable', false)->get();
 
             // Record the above files which do not exist (i.e., have not been encoded yet)
-            $trackFileIds = [];
+            $emptyTrackFiles = [];
             $count = 0;
             foreach ($trackFiles as $trackFile) {
                 if (!File::exists($trackFile->getFile())) {
                     $count++;
-                    $trackFileIds[] = $trackFile->id;
+                    $emptyTrackFiles[] = $trackFile;
                 }
             }
 
             // Encode recorded files
-            $encodeTrackFileCommand = new EncodeTrackFileCommand($trackFileIds);
-            $encodeTrackFileCommand->execute();
+            foreach($emptyTrackFiles as $emptyTrackFile) {
+                $this->dispatch(new EncodeTrackFile($emptyTrackFile, false));
+            }
 
             $this->info($count . ' tracks encoded.');
 

From f205cf6d9308423d91208b8d123f0563dfe593a3 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Tue, 27 Oct 2015 17:35:38 +0000
Subject: [PATCH 12/44] Implement EncodeTrackFile job

---
 app/Jobs/EncodeTrackFile.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
index 60b3953d..af168add 100644
--- a/app/Jobs/EncodeTrackFile.php
+++ b/app/Jobs/EncodeTrackFile.php
@@ -75,8 +75,8 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
             ->getFile();
 
         // Assign the target
-        $destination = $this->trackFile->track()->getDirectory();
-        $this->trackFile->track()->ensureDirectoryExists();
+        $destination = $this->trackFile->track->getDirectory();
+        $this->trackFile->track->ensureDirectoryExists();
         $target = $destination . '/' . $this->trackFile->getFilename();
 
         // Prepare the command
@@ -100,7 +100,7 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
         }
 
         // Update the tags of the track
-        $this->trackFile->track()->updateTags();
+        $this->trackFile->track->updateTags();
 
         // Insert the expiration time for cached tracks
         if ($this->isExpirable) {

From a03c44aadb713331ee58d5c53e5d0baef786e471 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Wed, 28 Oct 2015 17:32:44 +0000
Subject: [PATCH 13/44] Add cache routes

---
 app/Http/routes.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 64bc0691..a2358339 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -79,9 +79,11 @@ Route::group(['prefix' => 'api/web'], function() {
 
     Route::get('/tracks', 'Api\Web\TracksController@getIndex');
     Route::get('/tracks/{id}', 'Api\Web\TracksController@getShow')->where('id', '\d+');
+    Route::get('/tracks/cached/{id}/{format}', 'Api\Web\TracksController@getCachedTrack')->where(['id' => '\d+', 'name' => '.+']);
 
     Route::get('/albums', 'Api\Web\AlbumsController@getIndex');
     Route::get('/albums/{id}', 'Api\Web\AlbumsController@getShow')->where('id', '\d+');
+    Route::get('/albums/cached/{id}/{format}', 'Api\Web\AlbumsController@getCachedAlbum')->where(['id' => '\d+', 'name' => '.+']);
 
     Route::get('/playlists', 'Api\Web\PlaylistsController@getIndex');
     Route::get('/playlists/{id}', 'Api\Web\PlaylistsController@getShow')->where('id', '\d+');

From 629b9913ceb950a9f20fc095fce22b173ea4b28c Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Wed, 28 Oct 2015 17:55:21 +0000
Subject: [PATCH 14/44] Add cache handling for controllers

---
 .../Controllers/Api/Web/AlbumsController.php  | 50 +++++++++++++++++++
 .../Controllers/Api/Web/TracksController.php  | 37 ++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index 068d2d6c..fb9bee96 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -20,16 +20,19 @@
 
 namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Poniverse\Ponyfm\Album;
 use Poniverse\Ponyfm\Commands\CreateAlbumCommand;
 use Poniverse\Ponyfm\Commands\DeleteAlbumCommand;
 use Poniverse\Ponyfm\Commands\EditAlbumCommand;
 use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
 use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\ResourceLogItem;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
+use Poniverse\Ponyfm\Track;
 
 class AlbumsController extends ApiControllerBase
 {
@@ -83,6 +86,53 @@ class AlbumsController extends ApiControllerBase
         ], 200);
     }
 
+    public function getCachedAlbum($id, $format)
+    {
+        // Validation
+        try {
+            $album = Album::findOrFail($id);
+        } catch (ModelNotFoundException $e) {
+            return $this->notFound('Album not found!');
+        }
+
+        if (!array_key_exists($format, Track::$CacheableFormats)) {
+            return $this->notFound('Format not found!');
+        }
+
+        $tracks = $album->tracks;
+
+        $trackCount = 0;
+        $cachedCount = 0;
+
+        foreach($tracks as $track) {
+            if ($track->is_downloadable == false) {
+                continue;
+            } else {
+                $trackCount++;
+            }
+
+            try {
+                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
+            } catch (ModelNotFoundException $e) {
+                return $this->notFound('Track file for track ID ' . $track->id . ' not found!');
+            }
+
+            if ($trackFile->expiration != null) {
+                $cachedCount++;
+            } elseif ($trackFile->in_progress != true) {
+                $this->dispatch(new EncodeTrackFile($trackFile, true));
+            }
+        }
+
+        if ($trackCount === $cachedCount) {
+            $url = $album->getDownloadUrl($format);
+        } else {
+            $url = null;
+        }
+
+        return Response::json(['url' => $url], 200);
+    }
+
     public function getIndex()
     {
         $page = 1;
diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index 95580a79..77ba94de 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -20,10 +20,13 @@
 
 namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\File;
 use Poniverse\Ponyfm\Commands\DeleteTrackCommand;
 use Poniverse\Ponyfm\Commands\EditTrackCommand;
 use Poniverse\Ponyfm\Commands\UploadTrackCommand;
 use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\ResourceLogItem;
 use Poniverse\Ponyfm\Track;
 use Cover;
@@ -70,6 +73,40 @@ class TracksController extends ApiControllerBase
         return Response::json(['track' => $returned_track], 200);
     }
 
+    public function getCachedTrack($id, $format)
+    {
+        // Validation
+        try {
+            $track = Track::findOrFail($id);
+        } catch (ModelNotFoundException $e) {
+            return $this->notFound('Track not found!');
+        }
+
+        if (!$track->canView(Auth::user()))
+            return $this->notFound('Track not found!');
+
+        if (!in_array($format, array_keys(Track::$CacheableFormats))) {
+            return $this->notFound('Format not found!');
+        }
+
+        try {
+            $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
+        } catch (ModelNotFoundException $e) {
+            return $this->notFound('Track file not found!');
+        }
+
+        // Return URL or begin encoding
+        if ($trackFile->expiration != null && File::exists($trackFile->getFile())) {
+            $url = $track->getUrlFor($format);
+        } elseif ($trackFile->in_progress === true) {
+            $url = null;
+        } else {
+            $this->dispatch(new EncodeTrackFile($trackFile, true));
+            $url = null;
+        }
+
+    }
+
     public function getIndex()
     {
         $page = 1;

From 65159f31a3426ec9c23f01a8c2ca8cb7c53cd087 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:11:06 +0000
Subject: [PATCH 15/44] Fix returning of cached tracks

---
 app/Http/Controllers/Api/Web/TracksController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index 77ba94de..ca2913a0 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -105,6 +105,7 @@ class TracksController extends ApiControllerBase
             $url = null;
         }
 
+        return Response::json(['url' => $url], 200);
     }
 
     public function getIndex()

From 4c5a03329ac455824539590c61ff9bb48f6940c0 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:13:01 +0000
Subject: [PATCH 16/44] Add loading styling

---
 resources/assets/styles/content.less | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/assets/styles/content.less b/resources/assets/styles/content.less
index dd6824f9..b937aa45 100644
--- a/resources/assets/styles/content.less
+++ b/resources/assets/styles/content.less
@@ -360,6 +360,16 @@ html {
         background-color: lighten(@pfm-purple, 30%);
       }
     }
+    .cache-loading {
+      display: block;
+      margin-left: auto;
+      margin-right: auto;
+      text-align: center;
+      line-height: 100%;
+      font-size: 93%;
+      padding-left: 3px;
+      padding-right: 3px;
+    }
   }
 }
 

From d4526852cfd4e3a07bf778ef103ed2ea2609d70e Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:14:30 +0000
Subject: [PATCH 17/44] Add download-cached service

---
 .../app/services/download-cached.coffee       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 resources/assets/scripts/app/services/download-cached.coffee

diff --git a/resources/assets/scripts/app/services/download-cached.coffee b/resources/assets/scripts/app/services/download-cached.coffee
new file mode 100644
index 00000000..729988b5
--- /dev/null
+++ b/resources/assets/scripts/app/services/download-cached.coffee
@@ -0,0 +1,20 @@
+angular.module('ponyfm').factory('download-cached', [
+  '$rootScope', '$http', '$log'
+  ($rootScope, $http, $log) ->
+    download = (type, id, format) ->
+      url = '/api/web/' + type + '/download-cached/' + id + '/' + format
+
+      encodingComplete = (response) ->
+        if response.data.url == null
+          'pending'
+        else
+          response.data.url
+
+      encodingFailed = (error) ->
+        $log.error 'Error downloading encoded file - Status: ' + error.status + '- Message: ' + error.data
+        'error'
+
+      $http.get(url).then(encodingComplete).catch encodingFailed
+
+    {download: download}
+])
\ No newline at end of file

From 4876775f312c4d7f622be4100156d2ea21d95071 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:16:58 +0000
Subject: [PATCH 18/44] Add copyright notice to download-cached.coffee

---
 .../scripts/app/services/download-cached.coffee  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/resources/assets/scripts/app/services/download-cached.coffee b/resources/assets/scripts/app/services/download-cached.coffee
index 729988b5..397c69e4 100644
--- a/resources/assets/scripts/app/services/download-cached.coffee
+++ b/resources/assets/scripts/app/services/download-cached.coffee
@@ -1,3 +1,19 @@
+# Pony.fm - A community for pony fan music.
+# Copyright (C) 2015 Peter Deltchev
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 angular.module('ponyfm').factory('download-cached', [
   '$rootScope', '$http', '$log'
   ($rootScope, $http, $log) ->

From 88b57a631a3628dcf053f5353cf911653528889b Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:36:13 +0000
Subject: [PATCH 19/44] Update models with isCached

---
 app/Album.php | 3 ++-
 app/Track.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Album.php b/app/Album.php
index d71cc1fb..3a2b627a 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -99,7 +99,8 @@ class Album extends Model
                 'name' => $name,
                 'extension' => $format['extension'],
                 'url' => $album->getDownloadUrl($name),
-                'size' => Helpers::formatBytes($album->getFilesize($name))
+                'size' => Helpers::formatBytes($album->getFilesize($name)),
+                'isCacheable' => (in_array($name, array_keys(Track::$CacheableFormats)) ? true : false)
             ];
         }
 
diff --git a/app/Track.php b/app/Track.php
index 7e06db09..51ff35d8 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -235,7 +235,8 @@ class Track extends Model
                 'name' => $trackFile->format,
                 'extension' => $trackFile->extension,
                 'url' => $trackFile->url,
-                'size' => $trackFile->size
+                'size' => $trackFile->size,
+                'isCacheable' => $trackFile->is_cacheable
             ];
         }
 

From a5bc7491e060cff9caba59620add84f041955f3a Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:36:36 +0000
Subject: [PATCH 20/44] Fix URL for download-cached service

---
 resources/assets/scripts/app/services/download-cached.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/scripts/app/services/download-cached.coffee b/resources/assets/scripts/app/services/download-cached.coffee
index 397c69e4..fcbfef5b 100644
--- a/resources/assets/scripts/app/services/download-cached.coffee
+++ b/resources/assets/scripts/app/services/download-cached.coffee
@@ -18,7 +18,7 @@ angular.module('ponyfm').factory('download-cached', [
   '$rootScope', '$http', '$log'
   ($rootScope, $http, $log) ->
     download = (type, id, format) ->
-      url = '/api/web/' + type + '/download-cached/' + id + '/' + format
+      url = '/api/web/' + type + '/cached/' + id + '/' + format
 
       encodingComplete = (response) ->
         if response.data.url == null

From 58e49cc2f5a2a9de98b7c413d4f0312c7837c5c3 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:37:00 +0000
Subject: [PATCH 21/44] Implement ng-controllers for cached track downloads

---
 .../scripts/app/controllers/album.coffee      | 18 ++++++++++++++++--
 .../scripts/app/controllers/track.coffee      | 19 +++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/resources/assets/scripts/app/controllers/album.coffee b/resources/assets/scripts/app/controllers/album.coffee
index ae91498c..1815ea96 100644
--- a/resources/assets/scripts/app/controllers/album.coffee
+++ b/resources/assets/scripts/app/controllers/album.coffee
@@ -21,8 +21,8 @@ window.pfm.preloaders['album'] = [
 ]
 
 angular.module('ponyfm').controller "album", [
-    '$scope', 'albums', '$state', 'playlists', 'auth', '$dialog'
-    ($scope, albums, $state, playlists, auth, $dialog) ->
+    '$scope', 'albums', '$state', 'playlists', 'auth', '$dialog', 'download-cached', '$window', '$timeout'
+    ($scope, albums, $state, playlists, auth, $dialog, cachedAlbum, $window, $timeout) ->
         album = null
 
         albums.fetch($state.params.id).done (albumResponse) ->
@@ -40,4 +40,18 @@ angular.module('ponyfm').controller "album", [
         if auth.data.isLogged
             playlists.refreshOwned().done (lists) ->
                 $scope.playlists.push list for list in lists
+
+        $scope.getCachedAlbum = (id, format) ->
+            $scope.isEncoding = true
+
+            cachedAlbum.download('albums', id, format).then (response) ->
+                albumUrl = response
+                $scope.albumUrl = albumUrl
+                if albumUrl == 'error'
+                    $scope.isEncoding = false
+                else if albumUrl == 'pending'
+                    $timeout $scope.getCachedAlbum(id, format), 5000
+                else
+                    $scope.isEncoding = false
+                    $window.open albumUrl, '_blank'
 ]
diff --git a/resources/assets/scripts/app/controllers/track.coffee b/resources/assets/scripts/app/controllers/track.coffee
index 2ebe9246..76cb49fb 100644
--- a/resources/assets/scripts/app/controllers/track.coffee
+++ b/resources/assets/scripts/app/controllers/track.coffee
@@ -21,8 +21,8 @@ window.pfm.preloaders['track'] = [
 ]
 
 angular.module('ponyfm').controller "track", [
-    '$scope', 'tracks', '$state', 'playlists', 'auth', 'favourites', '$dialog'
-    ($scope, tracks, $state, playlists, auth, favourites, $dialog) ->
+    '$scope', 'tracks', '$state', 'playlists', 'auth', 'favourites', '$dialog', 'download-cached', '$window', '$timeout'
+    ($scope, tracks, $state, playlists, auth, favourites, $dialog, cachedTrack, $window, $timeout) ->
         track = null
 
         tracks.fetch($state.params.id).done (trackResponse) ->
@@ -72,4 +72,19 @@ angular.module('ponyfm').controller "track", [
 
             playlists.addTrackToPlaylist(playlist.id, $scope.track.id).done (res) ->
                 playlist.message = res.message
+
+        $scope.getCachedTrack = (id, format) ->
+          $scope.isEncoding = true
+
+          cachedTrack.download('tracks', id, format).then (response) ->
+            trackUrl = response
+            $scope.trackUrl = trackUrl
+            console.log(trackUrl);
+            if trackUrl == 'error'
+              $scope.isEncoding = false
+            else if trackUrl == 'pending'
+              $timeout $scope.getCachedTrack(id, format), 5000
+            else
+              $scope.isEncoding = false
+              $window.open trackUrl, '_blank'
 ]

From 7686533d64e2bd61074c3e7a83109c9be63fa5b7 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 14:37:25 +0000
Subject: [PATCH 22/44] Implement templates for frontend

---
 public/templates/albums/show.html | 7 ++++++-
 public/templates/tracks/show.html | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html
index ad2f7e06..9c5d64f5 100644
--- a/public/templates/albums/show.html
+++ b/public/templates/albums/show.html
@@ -5,7 +5,12 @@
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="album.is_downloadable == 1">
-                <li bindonce ng-repeat="format in album.formats"><a target="_blank" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a></li>
+                <li bindonce ng-repeat="format in album.formats" ng-hide="isEncoding">
+                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                    <a ng-if="format.isCacheable" ng-click="getCachedAlbum(album.id, format.name);" href=""><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                </li>
+                <li ng-show="isEncoding" class="cache-loading"><img src="/images/loading.gif" /></li>
+                <li ng-show="isEncoding" class="cache-loading"><small>We&#39;re getting your download ready! This may take up to a few minutes .</small></li>
             </ul>
         </li>
         <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li>
diff --git a/public/templates/tracks/show.html b/public/templates/tracks/show.html
index 8fce26d1..e01209aa 100644
--- a/public/templates/tracks/show.html
+++ b/public/templates/tracks/show.html
@@ -5,7 +5,12 @@
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="track.is_downloadable == 1">
-                <li bindonce ng-repeat="format in track.formats"><a target="_blank" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a></li>
+                <li bindonce ng-repeat="format in track.formats" ng-hide="isEncoding">
+                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                    <a ng-if="format.isCacheable" ng-click="getCachedTrack(track.id, format.name);" href=""><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                </li>
+                <li ng-show="isEncoding" class="cache-loading"><img src="/images/loading.gif" /></li>
+                <li ng-show="isEncoding" class="cache-loading"><small>We&#39;re getting your download ready! This'll take a few seconds.</small></li>
             </ul>
         </li>
         <li class="dropdown">

From 90de9cf8405b0f4c32d6d5e5a539c79b015e6e24 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 15:39:39 +0000
Subject: [PATCH 23/44] Add filesize column to track_files

---
 ...53827_update_track_files_with_filesize.php | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 database/migrations/2015_10_29_153827_update_track_files_with_filesize.php

diff --git a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
new file mode 100644
index 00000000..5c12d706
--- /dev/null
+++ b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateTrackFilesWithFilesize extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('track_files', function (Blueprint $table) {
+            $table->integer('filesize')->nullable()->unsigned();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('track_files', function (Blueprint $table) {
+            $table->dropColumn('filesize');
+        });
+    }
+}

From 5a81908ed48ed09e2fc243b6621c5ca7b7298f6e Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 16:00:16 +0000
Subject: [PATCH 24/44] Add file size rebuilding command

---
 app/Console/Commands/RebuildFilesize.php   | 77 ++++++++++++++++++++++
 app/Console/Commands/RebuildTrackCache.php |  5 +-
 app/Console/Kernel.php                     |  1 +
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 app/Console/Commands/RebuildFilesize.php

diff --git a/app/Console/Commands/RebuildFilesize.php b/app/Console/Commands/RebuildFilesize.php
new file mode 100644
index 00000000..a5d66cc9
--- /dev/null
+++ b/app/Console/Commands/RebuildFilesize.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Poniverse\Ponyfm\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+use Poniverse\Ponyfm\TrackFile;
+
+class RebuildFilesize extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'filesize:rebuild
+                            {--force : Skip all prompts.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Rebuilds the filesize cache for each track file which currently exists on disk.';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->info('This will only rebuild the cache for track files which exist on disk; non-existent files will be skipped.');
+
+        if ($this->option('force') || $this->confirm('Are you sure you want to rebuild the filesize cache? [y|N]',
+                false)
+        ) {
+
+            TrackFile::chunk(200, function ($trackFiles) {
+
+                $this->info('========== Start Chunk ==========');
+
+                foreach ($trackFiles as $trackFile) {
+                    $file = $trackFile->getFile();
+
+                    if (File::exists($file)) {
+                        $size = File::size($file);
+                        $this->info('ID ' . $trackFile->id . ' processed - ' . $size . ' bytes');
+                    } else {
+                        $size = null;
+                        $this->info('ID ' . $trackFile->id . ' skipped');
+                    }
+
+                    $trackFile->filesize = $size;
+                    $trackFile->update();
+                }
+
+                $this->info('=========== End Chunk ===========');
+
+            });
+
+            $this->info('Rebuild complete. Exiting.');
+
+        } else {
+            $this->info('Rebuild cancelled. Exiting.');
+        }
+    }
+}
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index ef5d5582..1dae63ce 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -64,6 +64,9 @@ class RebuildTrackCache extends Command
     public function handle()
     {
         $this->info('This will run \'php artisan down\' if you proceed and \'php artisan up\' when complete.');
+        $this->info('***');
+        $this->info('If this is your first time running this command, it is *highly* recommended that you run `php artisan filesize:rebuild` to cache file sizes for all files before they are deleted.');
+        $this->info('***');
 
         if ($this->option('force') || $this->confirm('Are you sure you want to delete all to-be-cached files and encode missing non-cached files? [y|N]',
                 false)
@@ -201,7 +204,7 @@ class RebuildTrackCache extends Command
             }
 
             // Encode recorded files
-            foreach($emptyTrackFiles as $emptyTrackFile) {
+            foreach ($emptyTrackFiles as $emptyTrackFile) {
                 $this->dispatch(new EncodeTrackFile($emptyTrackFile, false));
             }
 
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 6f76ff2b..9a7c58e2 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -41,6 +41,7 @@ class Kernel extends ConsoleKernel
         \Poniverse\Ponyfm\Console\Commands\PoniverseApiSetup::class,
         \Poniverse\Ponyfm\Console\Commands\ClearTrackCache::class,
         \Poniverse\Ponyfm\Console\Commands\RebuildTrackCache::class,
+        \Poniverse\Ponyfm\Console\Commands\RebuildFilesize::class,
     ];
 
     /**

From 4f9046af6e193f221fbdc6a334246bd772128fa1 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 16:10:38 +0000
Subject: [PATCH 25/44] Update file size caching for tracks

---
 app/Track.php     | 11 +----------
 app/TrackFile.php | 26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/Track.php b/app/Track.php
index 51ff35d8..18b1027e 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -433,16 +433,7 @@ class Track extends Model
 
     public function getFilesize($formatName)
     {
-        return Cache::remember($this->getCacheKey('filesize-' . $formatName), 1440, function () use ($formatName) {
-            $file = $this->getFileFor($formatName);
-            $size = 0;
-
-            if (is_file($file)) {
-                $size = filesize($file);
-            }
-
-            return $size;
-        });
+        return $this->trackFiles()->where('format', $formatName)->first()->filesize;
     }
 
     public function canView($user)
diff --git a/app/TrackFile.php b/app/TrackFile.php
index 1cccd287..8a1df20d 100644
--- a/app/TrackFile.php
+++ b/app/TrackFile.php
@@ -24,6 +24,7 @@ use Helpers;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\URL;
 
 class TrackFile extends Model
@@ -96,16 +97,7 @@ class TrackFile extends Model
 
     protected function getFilesize()
     {
-        return Cache::remember($this->getCacheKey('filesize'), 1440, function () {
-            $file = $this->getFile();
-            $size = 0;
-
-            if (is_file($file)) {
-                $size = filesize($file);
-            }
-
-            return $size;
-        });
+        return $this->filesize;
     }
 
     public function getDirectory()
@@ -134,4 +126,18 @@ class TrackFile extends Model
     {
         return 'track_file-' . $this->id . '-' . $key;
     }
+
+    public function updateFilesize()
+    {
+        $file = $this->getFile();
+
+        if (File::exists($file)) {
+            $size = File::size($file);
+        } else {
+            $size = null;
+        }
+
+        $this->filesize = $size;
+        $this->update();
+    }
 }

From 7fd13632eba46a72c5d8264f2f16a5218fc3dab1 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 16:10:55 +0000
Subject: [PATCH 26/44] Add file size caching for track encoding

---
 app/Jobs/EncodeTrackFile.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
index af168add..d2c76078 100644
--- a/app/Jobs/EncodeTrackFile.php
+++ b/app/Jobs/EncodeTrackFile.php
@@ -112,6 +112,9 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
         $this->trackFile->in_progress = false;
         $this->trackFile->update();
 
+        // Update file size
+        $this->trackFile->updateFilesize();
+
     }
 
     /**

From f5987db73522402ed1ed15f6d17e563f0e9d4ce3 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 16:26:01 +0000
Subject: [PATCH 27/44] Add file size addition during uploading

---
 app/Commands/UploadTrackCommand.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index 0679352e..ca14bc09 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -143,18 +143,25 @@ class UploadTrackCommand extends CommandBase
                 }
                 $track->trackFiles()->save($trackFile);
 
-                if ($trackFile->is_cacheable == false) {
-                    $target = $destination . '/' . $trackFile->getFilename();
+                // Encode track file
+                $target = $destination . '/' . $trackFile->getFilename();
 
-                    $command = $format['command'];
-                    $command = str_replace('{$source}', '"' . $source . '"', $command);
-                    $command = str_replace('{$target}', '"' . $target . '"', $command);
+                $command = $format['command'];
+                $command = str_replace('{$source}', '"' . $source . '"', $command);
+                $command = str_replace('{$target}', '"' . $target . '"', $command);
 
-                    Log::info('Encoding ' . $track->id . ' into ' . $target);
-                    $this->notify('Encoding ' . $name, $index / count(Track::$Formats) * 100);
+                Log::info('Encoding ' . $track->id . ' into ' . $target);
+                $this->notify('Encoding ' . $name, $index / count(Track::$Formats) * 100);
 
-                    $process = new Process($command);
-                    $process->mustRun();
+                $process = new Process($command);
+                $process->mustRun();
+
+                // Update file size for track file
+                $trackFile->updateFilesize();
+
+                // Delete track file if it is cacheable
+                if ($trackFile->is_cacheable == true) {
+                    \Illuminate\Support\Facades\File::delete($trackFile->getFile());
                 }
             }
 

From df930d629bab2fedf98a99f7e1fc691b6bea6170 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Thu, 29 Oct 2015 16:48:45 +0000
Subject: [PATCH 28/44] Add missing copyright notices

---
 app/Console/Commands/RebuildFilesize.php       | 18 ++++++++++++++++++
 ...153827_update_track_files_with_filesize.php | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/app/Console/Commands/RebuildFilesize.php b/app/Console/Commands/RebuildFilesize.php
index a5d66cc9..97d616ef 100644
--- a/app/Console/Commands/RebuildFilesize.php
+++ b/app/Console/Commands/RebuildFilesize.php
@@ -1,5 +1,23 @@
 <?php
 
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 namespace Poniverse\Ponyfm\Console\Commands;
 
 use Illuminate\Console\Command;
diff --git a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
index 5c12d706..f2661524 100644
--- a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
+++ b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
@@ -1,5 +1,23 @@
 <?php
 
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 

From 98e069e6a2ed67ea99e48088ef751b34773d274a Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Fri, 30 Oct 2015 15:29:18 +0000
Subject: [PATCH 29/44] Update copyright notices for created files

---
 app/Console/Commands/ClearTrackCache.php                        | 2 +-
 app/Console/Commands/RebuildFilesize.php                        | 2 +-
 app/Console/Commands/RebuildTrackCache.php                      | 2 +-
 app/Jobs/EncodeTrackFile.php                                    | 2 +-
 .../2015_10_26_192855_update_track_files_with_cache.php         | 2 +-
 .../2015_10_29_153827_update_track_files_with_filesize.php      | 2 +-
 resources/assets/scripts/app/services/download-cached.coffee    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Console/Commands/ClearTrackCache.php b/app/Console/Commands/ClearTrackCache.php
index 7ac592ee..10f14932 100644
--- a/app/Console/Commands/ClearTrackCache.php
+++ b/app/Console/Commands/ClearTrackCache.php
@@ -2,7 +2,7 @@
 
 /**
  * Pony.fm - A community for pony fan music.
- * Copyright (C) 2015 Peter Deltchev
+ * Copyright (C) 2015 Kelvin Zhang
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/app/Console/Commands/RebuildFilesize.php b/app/Console/Commands/RebuildFilesize.php
index 97d616ef..3f08f7e0 100644
--- a/app/Console/Commands/RebuildFilesize.php
+++ b/app/Console/Commands/RebuildFilesize.php
@@ -2,7 +2,7 @@
 
 /**
  * Pony.fm - A community for pony fan music.
- * Copyright (C) 2015 Peter Deltchev
+ * Copyright (C) 2015 Kelvin Zhang
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index 1dae63ce..3e00f82e 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -2,7 +2,7 @@
 
 /**
  * Pony.fm - A community for pony fan music.
- * Copyright (C) 2015 Peter Deltchev
+ * Copyright (C) 2015 Kelvin Zhang
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
index d2c76078..b178aec6 100644
--- a/app/Jobs/EncodeTrackFile.php
+++ b/app/Jobs/EncodeTrackFile.php
@@ -2,7 +2,7 @@
 
 /**
  * Pony.fm - A community for pony fan music.
- * Copyright (C) 2015 Peter Deltchev
+ * Copyright (C) 2015 Kelvin Zhang
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
index 3bc34189..69aff5a1 100644
--- a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
+++ b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
@@ -2,7 +2,7 @@
 
 /**
  * Pony.fm - A community for pony fan music.
- * Copyright (C) 2015 Peter Deltchev
+ * Copyright (C) 2015 Kelvin Zhang
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
index f2661524..d62a4244 100644
--- a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
+++ b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
@@ -2,7 +2,7 @@
 
 /**
  * Pony.fm - A community for pony fan music.
- * Copyright (C) 2015 Peter Deltchev
+ * Copyright (C) 2015 Kelvin Zhang
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/resources/assets/scripts/app/services/download-cached.coffee b/resources/assets/scripts/app/services/download-cached.coffee
index fcbfef5b..cbb09b6f 100644
--- a/resources/assets/scripts/app/services/download-cached.coffee
+++ b/resources/assets/scripts/app/services/download-cached.coffee
@@ -1,5 +1,5 @@
 # Pony.fm - A community for pony fan music.
-# Copyright (C) 2015 Peter Deltchev
+# Copyright (C) 2015 Kelvin Zhang
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

From eca01b5f29f5d16ff5f23e038fddb2d83f6a34f4 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Sat, 31 Oct 2015 12:19:12 +0000
Subject: [PATCH 30/44] Change rebuild commands to rebuild:command

---
 .../Commands/{RebuildFilesize.php => RebuildFilesizes.php}    | 4 ++--
 app/Console/Commands/RebuildTrackCache.php                    | 2 +-
 app/Console/Kernel.php                                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename app/Console/Commands/{RebuildFilesize.php => RebuildFilesizes.php} (96%)

diff --git a/app/Console/Commands/RebuildFilesize.php b/app/Console/Commands/RebuildFilesizes.php
similarity index 96%
rename from app/Console/Commands/RebuildFilesize.php
rename to app/Console/Commands/RebuildFilesizes.php
index 3f08f7e0..6678aff8 100644
--- a/app/Console/Commands/RebuildFilesize.php
+++ b/app/Console/Commands/RebuildFilesizes.php
@@ -24,14 +24,14 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Poniverse\Ponyfm\TrackFile;
 
-class RebuildFilesize extends Command
+class RebuildFilesizes extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'filesize:rebuild
+    protected $signature = 'rebuild:filesizes
                             {--force : Skip all prompts.}';
 
     /**
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index 3e00f82e..3eb461fb 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -37,7 +37,7 @@ class RebuildTrackCache extends Command
      *
      * @var string
      */
-    protected $signature = 'track-cache:rebuild
+    protected $signature = 'rebuild:track-cache
                             {--force : Skip all prompts.}';
 
     /**
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 9a7c58e2..67e02105 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -41,7 +41,7 @@ class Kernel extends ConsoleKernel
         \Poniverse\Ponyfm\Console\Commands\PoniverseApiSetup::class,
         \Poniverse\Ponyfm\Console\Commands\ClearTrackCache::class,
         \Poniverse\Ponyfm\Console\Commands\RebuildTrackCache::class,
-        \Poniverse\Ponyfm\Console\Commands\RebuildFilesize::class,
+        \Poniverse\Ponyfm\Console\Commands\RebuildFilesizes::class,
     ];
 
     /**

From b2408e3d845e4701dfab70d759f0d0abb3d18eb9 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Sun, 1 Nov 2015 16:49:28 +0000
Subject: [PATCH 31/44] Add in changes from code review

---
 app/Album.php                                 |  89 +++++--
 app/Commands/UploadTrackCommand.php           |   6 +-
 app/Console/Commands/ClearTrackCache.php      |  32 +--
 app/Console/Commands/RebuildFilesizes.php     |  11 +-
 app/Console/Commands/RebuildTrackCache.php    | 238 ++++++++++--------
 .../Controllers/Api/Web/AlbumsController.php  |  34 +--
 .../Controllers/Api/Web/TracksController.php  |   9 +-
 app/Jobs/EncodeTrackFile.php                  |  21 +-
 app/Track.php                                 |  90 ++++---
 app/TrackFile.php                             |   2 +
 config/ponyfm.php                             |   4 +-
 ...6_192855_update_track_files_with_cache.php |   4 +-
 ...53827_update_track_files_with_filesize.php |   8 +-
 public/templates/albums/show.html             |  16 +-
 public/templates/tracks/show.html             |  16 +-
 .../scripts/app/controllers/album.coffee      |  15 +-
 .../scripts/app/controllers/track.coffee      |  16 +-
 .../app/services/download-cached.coffee       |   2 +-
 resources/assets/styles/content.less          |   1 +
 19 files changed, 354 insertions(+), 260 deletions(-)

diff --git a/app/Album.php b/app/Album.php
index 3a2b627a..a6b8c7be 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -21,17 +21,21 @@
 namespace Poniverse\Ponyfm;
 
 use Exception;
+use Helpers;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\URL;
+use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\Traits\SlugTrait;
-use Helpers;
 
 class Album extends Model
 {
-    use SoftDeletes, SlugTrait;
+    use SoftDeletes, SlugTrait, DispatchesJobs;
 
     protected $dates = ['deleted_at'];
 
@@ -100,7 +104,7 @@ class Album extends Model
                 'extension' => $format['extension'],
                 'url' => $album->getDownloadUrl($name),
                 'size' => Helpers::formatBytes($album->getFilesize($name)),
-                'isCacheable' => (in_array($name, array_keys(Track::$CacheableFormats)) ? true : false)
+                'isCacheable' => (in_array($name, Track::$CacheableFormats) ? true : false)
             ];
         }
 
@@ -146,24 +150,24 @@ class Album extends Model
             $userRow = $album->users[0];
             $userData = [
                 'stats' => [
-                    'views' => (int) $userRow->view_count,
-                    'downloads' => (int) $userRow->download_count,
+                    'views' => (int)$userRow->view_count,
+                    'downloads' => (int)$userRow->download_count,
                 ],
-                'is_favourited' => (bool) $userRow->is_favourited
+                'is_favourited' => (bool)$userRow->is_favourited
             ];
         }
 
         return [
-            'id' => (int) $album->id,
-            'track_count' => (int) $album->track_count,
+            'id' => (int)$album->id,
+            'track_count' => (int)$album->track_count,
             'title' => $album->title,
             'slug' => $album->slug,
             'created_at' => $album->created_at,
             'stats' => [
-                'views' => (int) $album->view_count,
-                'downloads' => (int) $album->download_count,
-                'comments' => (int) $album->comment_count,
-                'favourites' => (int) $album->favourite_count
+                'views' => (int)$album->view_count,
+                'downloads' => (int)$album->download_count,
+                'comments' => (int)$album->comment_count,
+                'favourites' => (int)$album->favourite_count
             ],
             'covers' => [
                 'small' => $album->getCoverUrl(Image::SMALL),
@@ -171,7 +175,7 @@ class Album extends Model
             ],
             'url' => $album->url,
             'user' => [
-                'id' => (int) $album->user->id,
+                'id' => (int)$album->user->id,
                 'name' => $album->user->display_name,
                 'url' => $album->user->url,
             ],
@@ -263,6 +267,63 @@ class Album extends Model
         }
     }
 
+    public function countDownloadableTracks()
+    {
+        $trackCount = 0;
+
+        foreach ($this->tracks as $track) {
+            if ($track->is_downloadable == true) {
+                $trackCount++;
+            } else {
+                continue;
+            }
+        }
+
+        return $trackCount;
+    }
+
+    public function countCacheableTrackFiles($format)
+    {
+        $cachedCount = 0;
+
+        foreach ($this->tracks as $track) {
+            if ($track->is_downloadable == false) {
+                continue;
+            }
+
+            try {
+                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
+            } catch (ModelNotFoundException $e) {
+                throw $e;
+            }
+
+            if ($trackFile->expires_at != null && File::exists($trackFile->getFile())) {
+                $cachedCount++;
+            }
+        }
+
+        return $cachedCount;
+    }
+
+    public function encodeCacheableTrackFiles($format)
+    {
+        foreach ($this->tracks as $track) {
+            if ($track->is_downloadable == false) {
+                continue;
+            }
+
+            try {
+                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
+            } catch (ModelNotFoundException $e) {
+                throw $e;
+            }
+
+            if (!File::exists($trackFile->getFile()) && $trackFile->is_in_progress != true) {
+                $this->dispatch(new EncodeTrackFile($trackFile, true));
+            }
+        }
+    }
+
     public function syncTrackIds($trackIds)
     {
         $trackIdsInAlbum = [];
@@ -332,7 +393,7 @@ class Album extends Model
         }
     }
 
-    private function getCacheKey($key)
+    public function getCacheKey($key)
     {
         return 'album-' . $this->id . '-' . $key;
     }
diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index ca14bc09..776c440f 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -136,7 +136,7 @@ class UploadTrackCommand extends CommandBase
                 $trackFile = new TrackFile();
                 $trackFile->is_master = $name === 'FLAC' ? true : false;
                 $trackFile->format = $name;
-                if (array_key_exists($name, Track::$CacheableFormats) && $trackFile->is_master == false) {
+                if (in_array($name, Track::$CacheableFormats) && $trackFile->is_master == false) {
                     $trackFile->is_cacheable = true;
                 } else {
                     $trackFile->is_cacheable = false;
@@ -144,7 +144,7 @@ class UploadTrackCommand extends CommandBase
                 $track->trackFiles()->save($trackFile);
 
                 // Encode track file
-                $target = $destination . '/' . $trackFile->getFilename();
+                $target = $trackFile->getFile();
 
                 $command = $format['command'];
                 $command = str_replace('{$source}', '"' . $source . '"', $command);
@@ -161,7 +161,7 @@ class UploadTrackCommand extends CommandBase
 
                 // Delete track file if it is cacheable
                 if ($trackFile->is_cacheable == true) {
-                    \Illuminate\Support\Facades\File::delete($trackFile->getFile());
+                    File::delete($trackFile->getFile());
                 }
             }
 
diff --git a/app/Console/Commands/ClearTrackCache.php b/app/Console/Commands/ClearTrackCache.php
index 10f14932..5c5feea1 100644
--- a/app/Console/Commands/ClearTrackCache.php
+++ b/app/Console/Commands/ClearTrackCache.php
@@ -60,45 +60,45 @@ class ClearTrackCache extends Command
      */
     public function handle()
     {
-        if ($this->option('tracks') == 'all') {
-            // Get all cacheable tracks
-            $trackFiles = TrackFile::where('is_cacheable', true)->get();
-        } else {
-            // Get all expired tracks
+        if ($this->option('tracks') === 'all') {
+            // Get all cacheable track files
             $trackFiles = TrackFile::where('is_cacheable', true)
-                ->where('expiration', '<=', Carbon::now())
+                ->with('track.album')
+                ->get();
+        } else {
+            // Get all expired track files
+            $trackFiles = TrackFile::where('is_cacheable', true)
+                ->where('expires_at', '<=', Carbon::now())
+                ->with('track.album')
                 ->get();
-
         }
 
-        // Delete above tracks
+        // Delete above track files
         if (count($trackFiles) === 0) {
             $this->info('No tracks found. Exiting.');
         } else {
 
-            if ($this->option('force') || $this->confirm(count($trackFiles) . ' tracks found. Proceed to delete? [y|N]', false)) {
+            if ($this->option('force') || $this->confirm(count($trackFiles) . ' cacheable track files found. Proceed to delete their files if they exist? [y|N]', false)) {
 
                 $count = 0;
 
                 foreach ($trackFiles as $trackFile) {
 
                     // Set expiration to null (so can be re-cached upon request)
-                    $trackFile->expiration = null;
+                    $trackFile->expires_at = null;
                     $trackFile->update();
 
-                    // Delete files if exists
+                    // Delete file if exists
                     if (File::exists($trackFile->getFile())) {
                         $count++;
                         File::delete($trackFile->getFile());
 
-                        // Remove the cached file sizes for main, trackfile and format
-                        Cache::forget($trackFile->getCacheKey('filesize'));
-                        Cache::forget($trackFile->track()->getCacheKey('filesize-' . $trackFile->format));
-                        Cache::forget($trackFile->track()->album()->getCacheKey('filesize-' . $trackFile->format));
-
                         $this->info('Deleted ' . $trackFile->getFile());
                     }
 
+                    // Remove the cached file size for the album
+                    Cache::forget($trackFile->track->album->getCacheKey('filesize-' . $trackFile->format));
+
                 }
                 $this->info($count . ' files deleted. Deletion complete. Exiting.');
             } else {
diff --git a/app/Console/Commands/RebuildFilesizes.php b/app/Console/Commands/RebuildFilesizes.php
index 6678aff8..3d81a34a 100644
--- a/app/Console/Commands/RebuildFilesizes.php
+++ b/app/Console/Commands/RebuildFilesizes.php
@@ -21,7 +21,6 @@
 namespace Poniverse\Ponyfm\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
 use Poniverse\Ponyfm\TrackFile;
 
 class RebuildFilesizes extends Command
@@ -68,18 +67,12 @@ class RebuildFilesizes extends Command
                 $this->info('========== Start Chunk ==========');
 
                 foreach ($trackFiles as $trackFile) {
-                    $file = $trackFile->getFile();
-
-                    if (File::exists($file)) {
-                        $size = File::size($file);
+                    $size = $trackFile->updateFilesize();
+                    if ($size !== null) {
                         $this->info('ID ' . $trackFile->id . ' processed - ' . $size . ' bytes');
                     } else {
-                        $size = null;
                         $this->info('ID ' . $trackFile->id . ' skipped');
                     }
-
-                    $trackFile->filesize = $size;
-                    $trackFile->update();
                 }
 
                 $this->info('=========== End Chunk ===========');
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index 3eb461fb..510236ba 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -63,154 +63,192 @@ class RebuildTrackCache extends Command
      */
     public function handle()
     {
-        $this->info('This will run \'php artisan down\' if you proceed and \'php artisan up\' when complete.');
         $this->info('***');
-        $this->info('If this is your first time running this command, it is *highly* recommended that you run `php artisan filesize:rebuild` to cache file sizes for all files before they are deleted.');
+        $this->info('If this is your first time running this command, it is *highly* recommended that you ensure the file sizes for all track files have been populated.');
         $this->info('***');
 
-        if ($this->option('force') || $this->confirm('Are you sure you want to delete all to-be-cached files and encode missing non-cached files? [y|N]',
+        if ($this->option('force') || $this->confirm('Are you sure you want to delete all to-be-cached track files and encode missing non-cached track files?',
                 false)
         ) {
 
-            $this->call('down');
-
             //==========================================================================================================
-            // Delete previously cached tracks
+            // Delete previously cached track files
             //==========================================================================================================
 
-            // Find files which are cacheable and NOT master
-            $trackFiles = TrackFile::where('is_cacheable', true)
+            $this->output->newLine(1);
+            $this->info('========== Step 1/4 - Deleting previously cached track files. ==========');
+
+            $count = 0;
+
+            // Chunk track files which are cacheable and NOT master
+            TrackFile::where('is_cacheable', true)
                 ->where('is_master', false)
-                ->get();
+                ->chunk(200, function ($trackFiles) use (&$count) {
+                    // Delete chunked track files
+                    foreach ($trackFiles as $trackFile) {
+                        // Clear expiration so will be re-cached on next request
+                        $trackFile->expires_at = null;
+                        $trackFile->update();
 
-            // Delete above files
-            if (count($trackFiles) == 0) {
-                $this->info('No tracks found. Continuing.');
-            } else {
-                $this->info(count($trackFiles) . ' tracks found.');
-                $count = 0;
-
-                foreach ($trackFiles as $trackFile) {
-                    // Clear expiration so will be re-cached on next request
-                    $trackFile->expiration = null;
-                    $trackFile->update();
-
-                    // Delete files
-                    if (File::exists($trackFile->getFile())) {
-                        $count++;
-                        File::delete($trackFile->getFile());
-                        $this->info('Deleted ' . $trackFile->getFile());
+                        // Delete files
+                        if (File::exists($trackFile->getFile())) {
+                            $count++;
+                            File::delete($trackFile->getFile());
+                            $this->info('Deleted ' . $trackFile->getFile());
+                        }
                     }
-                }
 
-                $this->info($count . ' files deleted. Deletion complete. Continuing.');
-            }
+                    $this->info($count . ' track files deleted. Deletion complete. Continuing.');
+                });
 
             //==========================================================================================================
-            // Update the database entries for cacheable files - non-cacheable to cacheable
+            // Update the database entries for cacheable track files - non-cacheable to cacheable
             //==========================================================================================================
 
-            $this->info('--- Step 2/4 - Updating is_cacheable entries in database. ---');
-
-            // Find files which are meant to be cacheable and NOT master, but currently not cacheable
-            $trackFiles = TrackFile::where('is_cacheable', false)
-                ->whereIn('format', array_keys(Track::$CacheableFormats))
-                ->where('is_master', false)
-                ->get();
+            $this->output->newLine(3);
+            $this->info('========== Step 2/4 - Updating is_cacheable entries in database. ==========');
 
+            $trackFileCount = 0;
             $formats = [];
 
-            // Set above files to cacheable in the database
-            foreach ($trackFiles as $trackFile) {
-                // Let user know which formats, previously not cached, were made cacheable
-                $formats[] = $trackFile->format;
+            // Find track files which are meant to be cacheable and NOT master, but currently not cacheable
+            TrackFile::where('is_cacheable', false)
+                ->whereIn('format', Track::$CacheableFormats)
+                ->where('is_master', false)
+                ->chunk(200, function ($trackFiles) use (&$trackFileCount, &$formats) {
+                    $this->output->newLine(1);
+                    $this->info('---------- Start Chunk ----------');
 
-                $trackFile->expiration = null;
-                $trackFile->is_cacheable = true;
-                $trackFile->update();
-            }
+                    // Set above files to cacheable in the database
+                    foreach ($trackFiles as $trackFile) {
+                        $trackFileCount++;
+
+                        // Let user know which formats, previously not cached, were made cacheable
+                        $formats[] = $trackFile->format;
+
+                        $trackFile->expires_at = null;
+                        $trackFile->is_cacheable = true;
+                        $trackFile->update();
+                    }
+
+                    $this->info('----------- End Chunk -----------');
+                    $this->output->newLine(1);
+                });
 
             $this->info('Format(s) set from non-cacheable to cacheable: ' . implode(' ', array_unique($formats)));
-            $this->info(count($trackFiles) . ' non-cacheable tracks set to cacheable.');
+            $this->info($trackFileCount . ' non-cacheable track files set to cacheable.');
+
+            $this->output->newLine(2);
 
             //==========================================================================================================
-            // Update the database entries for cacheable files - cacheable to non-cacheable
+            // Update the database entries for cacheable track files - cacheable to non-cacheable
             //==========================================================================================================
 
-            // Find files which are NOT meant to be cacheable, but currently cacheable
-            $trackFiles = TrackFile::where('is_cacheable', true)
-                ->whereNotIn('format', array_keys(Track::$CacheableFormats))
-                ->get();
-
+            $trackFileCount = 0;
             $formats = [];
 
-            // Set above files to non-cacheable in the database
-            foreach ($trackFiles as $trackFile) {
-                // Let user know which formats, previously not cached, were made cacheable
-                $formats[] = $trackFile->format;
+            // Chunk track files which are NOT meant to be cacheable, but currently cacheable
+            TrackFile::where('is_cacheable', true)
+                ->whereNotIn('format', Track::$CacheableFormats)
+                ->chunk(200, function ($trackFiles) use (&$trackFileCount, &$formats) {
+                    $this->output->newLine(1);
+                    $this->info('---------- Start Chunk ----------');
+
+                    // Set chunked track files to non-cacheable in the database
+                    foreach ($trackFiles as $trackFile) {
+                        $trackFileCount++;
+
+                        // Let user know which formats, previously not cached, were made cacheable
+                        $formats[] = $trackFile->format;
+
+                        $trackFile->expires_at = null;
+                        $trackFile->is_cacheable = false;
+                        $trackFile->update();
+                    }
+
+                    $this->info('----------- End Chunk -----------');
+                    $this->output->newLine(1);
+                    $this->output->newLine(1);
+                });
 
-                $trackFile->expiration = null;
-                $trackFile->is_cacheable = false;
-                $trackFile->update();
-            }
 
             $this->info('Format(s) set from cacheable to non-cacheable: ' . implode(' ', array_unique($formats)));
-            $this->info(count($trackFiles) . ' cacheable tracks set to non-cacheable.');
+            $this->info($trackFileCount . ' cacheable track files set to non-cacheable.');
 
             //==========================================================================================================
-            // Delete files which have now been marked as cacheable
+            // Delete track files which have now been marked as cacheable
             //==========================================================================================================
 
-            $this->info('--- Step 3/4 - Deleting now-cacheable files. ---');
+            $this->output->newLine(3);
+            $this->info('========== Step 3/4 - Deleting now-cacheable track files. ==========');
 
-            // Find files which are cacheable and NOT master
-            $trackFiles = TrackFile::whereIn('format', array_keys(Track::$CacheableFormats))
+            $count = 0;
+            $trackFileCount = 0;
+
+            // Find track files which are cacheable and NOT master
+            TrackFile::whereIn('format', Track::$CacheableFormats)
                 ->where('is_master', false)
-                ->get();
+                ->chunk(200, function ($trackFiles) use (&$count, &$trackFileCount) {
+                    $this->output->newLine(1);
+                    $this->info('---------- Start Chunk ----------');
+
+                    foreach ($trackFiles as $trackFile) {
+                        $trackFileCount++;
+
+                        // Delete track files if track files exist; double-check that they are NOT master files
+                        if (File::exists($trackFile->getFile()) && $trackFile->is_master == false) {
+                            $count++;
+
+                            File::delete($trackFile->getFile());
+                            $this->info('Deleted ' . $trackFile->getFile());
+                        }
+                    }
+
+                    $this->info('----------- End Chunk -----------');
+                    $this->output->newLine(1);
+                });
+
+
+            $this->info(sprintf('%d track files deleted out of %d track files. Continuing.', $count, $trackFileCount));
+
+            //==========================================================================================================
+            // Encode missing (i.e., now non-cacheable) track files
+            //==========================================================================================================
+
+            $this->output->newLine(3);
+            $this->info('========== Step 4/4 - Encoding missing track files. ==========');
+
+            $count = 0;
+
+            // Chunk non-cacheable track files
+            TrackFile::where('is_cacheable', false)->chunk(200, function ($trackFiles) use (&$count) {
+                $this->output->newLine(1);
+                $this->info('---------- Start Chunk ----------');
+
+                // Record the track files which do not exist (i.e., have not been encoded yet)
+                $emptyTrackFiles = [];
 
-            // Delete above files
-            if (count($trackFiles) == 0) {
-                $this->info('No tracks to delete found. Continuing.');
-            } else {
-                $count = 0;
                 foreach ($trackFiles as $trackFile) {
-                    // Delete files if files exist; double-check that they are NOT master files
-                    if (File::exists($trackFile->getFile()) && $trackFile->is_master == false) {
+                    if (!File::exists($trackFile->getFile())) {
                         $count++;
-                        File::delete($trackFile->getFile());
-                        $this->info('Deleted ' . $trackFile->getFile());
+                        $emptyTrackFiles[] = $trackFile;
                     }
                 }
-                $this->info(sprintf('%d files deleted out of %d tracks. Continuing.', $count, count($trackFiles)));
-            }
 
-            //==========================================================================================================
-            // Encode missing (i.e., now non-cacheable) files
-            //==========================================================================================================
-
-            $this->info('--- Step 4/4 - Encoding missing files. ---');
-
-            // Get non-cacheable files
-            $trackFiles = TrackFile::where('is_cacheable', false)->get();
-
-            // Record the above files which do not exist (i.e., have not been encoded yet)
-            $emptyTrackFiles = [];
-            $count = 0;
-            foreach ($trackFiles as $trackFile) {
-                if (!File::exists($trackFile->getFile())) {
-                    $count++;
-                    $emptyTrackFiles[] = $trackFile;
+                // Encode recorded track files
+                foreach ($emptyTrackFiles as $emptyTrackFile) {
+                    $this->info("Started encoding track file ID {$emptyTrackFile->id}");
+                    $this->dispatch(new EncodeTrackFile($emptyTrackFile, false));
                 }
-            }
 
-            // Encode recorded files
-            foreach ($emptyTrackFiles as $emptyTrackFile) {
-                $this->dispatch(new EncodeTrackFile($emptyTrackFile, false));
-            }
+                $this->info('----------- End Chunk -----------');
+                $this->output->newLine(1);
+            });
 
-            $this->info($count . ' tracks encoded.');
 
-            $this->call('up');
+            $this->info($count . ' track files encoded.');
+            $this->output->newLine(1);
+
             $this->info('Rebuild complete. Exiting.');
 
         } else {
diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index fb9bee96..c2536145 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -21,6 +21,7 @@
 namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\File;
 use Poniverse\Ponyfm\Album;
 use Poniverse\Ponyfm\Commands\CreateAlbumCommand;
 use Poniverse\Ponyfm\Commands\DeleteAlbumCommand;
@@ -90,43 +91,26 @@ class AlbumsController extends ApiControllerBase
     {
         // Validation
         try {
-            $album = Album::findOrFail($id);
+            $album = Album::with('tracks.trackFiles')->findOrFail($id);
         } catch (ModelNotFoundException $e) {
             return $this->notFound('Album not found!');
         }
 
-        if (!array_key_exists($format, Track::$CacheableFormats)) {
+        if (!in_array($format, Track::$CacheableFormats)) {
             return $this->notFound('Format not found!');
         }
 
-        $tracks = $album->tracks;
-
-        $trackCount = 0;
-        $cachedCount = 0;
-
-        foreach($tracks as $track) {
-            if ($track->is_downloadable == false) {
-                continue;
-            } else {
-                $trackCount++;
-            }
-
-            try {
-                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
-            } catch (ModelNotFoundException $e) {
-                return $this->notFound('Track file for track ID ' . $track->id . ' not found!');
-            }
-
-            if ($trackFile->expiration != null) {
-                $cachedCount++;
-            } elseif ($trackFile->in_progress != true) {
-                $this->dispatch(new EncodeTrackFile($trackFile, true));
-            }
+        $trackCount = $album->countDownloadableTracks();
+        try {
+            $cachedCount = $album->countCacheableTrackFiles($format);
+        } catch (ModelNotFoundException $e) {
+            return $this->notFound('Track file in album not found!');
         }
 
         if ($trackCount === $cachedCount) {
             $url = $album->getDownloadUrl($format);
         } else {
+            $album->encodeCacheableTrackFiles($format);
             $url = null;
         }
 
diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index ca2913a0..81fefdce 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -85,7 +85,10 @@ class TracksController extends ApiControllerBase
         if (!$track->canView(Auth::user()))
             return $this->notFound('Track not found!');
 
-        if (!in_array($format, array_keys(Track::$CacheableFormats))) {
+        if ($track->is_downloadable == false)
+            return $this->notFound('Track not found!');
+
+        if (!in_array($format, Track::$CacheableFormats)) {
             return $this->notFound('Format not found!');
         }
 
@@ -96,9 +99,9 @@ class TracksController extends ApiControllerBase
         }
 
         // Return URL or begin encoding
-        if ($trackFile->expiration != null && File::exists($trackFile->getFile())) {
+        if ($trackFile->expires_at != null && File::exists($trackFile->getFile())) {
             $url = $track->getUrlFor($format);
-        } elseif ($trackFile->in_progress === true) {
+        } elseif ($trackFile->is_in_progress === true) {
             $url = null;
         } else {
             $this->dispatch(new EncodeTrackFile($trackFile, true));
diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
index b178aec6..9f535517 100644
--- a/app/Jobs/EncodeTrackFile.php
+++ b/app/Jobs/EncodeTrackFile.php
@@ -65,10 +65,10 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
     public function handle()
     {
         // Start the job
-        $this->trackFile->in_progress = true;
+        $this->trackFile->is_in_progress = true;
         $this->trackFile->update();
 
-        // Assign the source to the track's master file
+        // Use the track's master file as the source
         $source = TrackFile::where('track_id', $this->trackFile->track_id)
             ->where('is_master', true)
             ->first()
@@ -77,7 +77,7 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
         // Assign the target
         $destination = $this->trackFile->track->getDirectory();
         $this->trackFile->track->ensureDirectoryExists();
-        $target = $destination . '/' . $this->trackFile->getFilename();
+        $target = $this->trackFile->getFile();
 
         // Prepare the command
         $format = Track::$Formats[$this->trackFile->format];
@@ -100,21 +100,20 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
         }
 
         // Update the tags of the track
-        $this->trackFile->track->updateTags();
+        $this->trackFile->track->updateTags($this->trackFile->format);
 
         // Insert the expiration time for cached tracks
         if ($this->isExpirable) {
-            $this->trackFile->expiration = Carbon::now()->addMinutes(Config::get('ponyfm.cache_duration'));
+            $this->trackFile->expires_at = Carbon::now()->addMinutes(Config::get('ponyfm.track_file_cache_duration'));
             $this->trackFile->update();
         }
 
-        // Complete the job
-        $this->trackFile->in_progress = false;
-        $this->trackFile->update();
-
         // Update file size
         $this->trackFile->updateFilesize();
 
+        // Complete the job
+        $this->trackFile->is_in_progress = false;
+        $this->trackFile->update();
     }
 
     /**
@@ -124,8 +123,8 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
      */
     public function failed()
     {
-        $this->trackFile->in_progress = false;
-        $this->trackFile->expiration = null;
+        $this->trackFile->is_in_progress = false;
+        $this->trackFile->expires_at = null;
         $this->trackFile->update();
     }
 }
diff --git a/app/Track.php b/app/Track.php
index 18b1027e..352d54a5 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -20,20 +20,20 @@
 
 namespace Poniverse\Ponyfm;
 
-use Poniverse\Ponyfm\Traits\SlugTrait;
+use Auth;
+use Cache;
+use Config;
+use DB;
 use Exception;
 use External;
 use getid3_writetags;
 use Helpers;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Auth;
-use Cache;
-use Config;
-use DB;
-use Log;
-use URL;
 use Illuminate\Support\Str;
+use Log;
+use Poniverse\Ponyfm\Traits\SlugTrait;
+use URL;
 
 class Track extends Model
 {
@@ -94,29 +94,14 @@ class Track extends Model
     ];
 
     public static $CacheableFormats = [
-        'OGG Vorbis' => [
-            'index' => 2,
-            'is_lossless' => false,
-            'extension' => 'ogg',
-            'tag_format' => 'vorbiscomment',
-            'tag_method' => 'updateTagsWithGetId3',
-            'mime_type' => 'audio/ogg',
-            'command' => 'ffmpeg 2>&1 -y -i {$source} -acodec libvorbis -aq 7 -f ogg {$target}'
-        ],
-        'ALAC' => [
-            'index' => 4,
-            'is_lossless' => true,
-            'extension' => 'alac.m4a',
-            'tag_format' => 'AtomicParsley',
-            'tag_method' => 'updateTagsWithAtomicParsley',
-            'mime_type' => 'audio/mp4',
-            'command' => 'ffmpeg 2>&1 -y -i {$source} -acodec alac {$target}'
-        ],
+        'OGG Vorbis',
+        'ALAC',
     ];
 
     public static function summary()
     {
-        return self::select('tracks.id', 'title', 'user_id', 'slug', 'is_vocal', 'is_explicit', 'created_at', 'published_at',
+        return self::select('tracks.id', 'title', 'user_id', 'slug', 'is_vocal', 'is_explicit', 'created_at',
+            'published_at',
             'duration', 'is_downloadable', 'genre_id', 'track_type_id', 'cover_id', 'album_id', 'comment_count',
             'download_count', 'view_count', 'play_count', 'favourite_count');
     }
@@ -269,41 +254,41 @@ class Track extends Model
             $userRow = $track->users[0];
             $userData = [
                 'stats' => [
-                    'views' => (int) $userRow->view_count,
-                    'plays' => (int) $userRow->play_count,
+                    'views' => (int)$userRow->view_count,
+                    'plays' => (int)$userRow->play_count,
                     'downloads' => $userRow->download_count,
                 ],
-                'is_favourited' => (bool) $userRow->is_favourited
+                'is_favourited' => (bool)$userRow->is_favourited
             ];
         }
 
         return [
-            'id' => (int) $track->id,
+            'id' => (int)$track->id,
             'title' => $track->title,
             'user' => [
-                'id' => (int) $track->user->id,
+                'id' => (int)$track->user->id,
                 'name' => $track->user->display_name,
                 'url' => $track->user->url
             ],
             'stats' => [
-                'views' => (int) $track->view_count,
-                'plays' => (int) $track->play_count,
-                'downloads' => (int) $track->download_count,
-                'comments' => (int) $track->comment_count,
-                'favourites' => (int) $track->favourite_count
+                'views' => (int)$track->view_count,
+                'plays' => (int)$track->play_count,
+                'downloads' => (int)$track->download_count,
+                'comments' => (int)$track->comment_count,
+                'favourites' => (int)$track->favourite_count
             ],
             'url' => $track->url,
             'slug' => $track->slug,
-            'is_vocal' => (bool) $track->is_vocal,
-            'is_explicit' => (bool) $track->is_explicit,
-            'is_downloadable' => (bool) $track->is_downloadable,
-            'is_published' => (bool) $track->isPublished(),
+            'is_vocal' => (bool)$track->is_vocal,
+            'is_explicit' => (bool)$track->is_explicit,
+            'is_downloadable' => (bool)$track->is_downloadable,
+            'is_published' => (bool)$track->isPublished(),
             'published_at' => $track->published_at,
             'duration' => $track->duration,
             'genre' => $track->genre != null
                 ?
                 [
-                    'id' => (int) $track->genre->id,
+                    'id' => (int)$track->genre->id,
                     'slug' => $track->genre->slug,
                     'name' => $track->genre->name
                 ] : null,
@@ -571,11 +556,22 @@ class Track extends Model
         $this->hash = md5(Helpers::sanitizeInputForHashing($this->user->display_name) . ' - ' . Helpers::sanitizeInputForHashing($this->title));
     }
 
-    public function updateTags()
+    public function updateTags($trackFileFormat = 'all')
     {
-        $this->trackFiles()->touch();
+        if ($trackFileFormat === 'all') {
+            foreach ($this->trackFiles as $trackFile) {
+                $this->updateTagsForTrackFile($trackFile);
+            }
+        } else {
+            $trackFile = $this->trackFiles()->where('format', $trackFileFormat)->firstOrFail();
+            $this->updateTagsForTrackFile($trackFile);
+        }
+    }
 
-        foreach ($this->trackFiles as $trackFile) {
+    private function updateTagsForTrackFile($trackFile) {
+        $trackFile->touch();
+
+        if (\File::exists($trackFile->getFile())) {
             $format = $trackFile->format;
             $data = self::$Formats[$format];
 
@@ -654,10 +650,12 @@ class Track extends Model
 
         if ($tagWriter->WriteTags()) {
             if (!empty($tagWriter->warnings)) {
-                Log::warning('Track #'.$this->id.': There were some warnings:<br />' . implode('<br /><br />', $tagWriter->warnings));
+                Log::warning('Track #' . $this->id . ': There were some warnings:<br />' . implode('<br /><br />',
+                        $tagWriter->warnings));
             }
         } else {
-            Log::error('Track #' . $this->id . ': Failed to write tags!<br />' . implode('<br /><br />', $tagWriter->errors));
+            Log::error('Track #' . $this->id . ': Failed to write tags!<br />' . implode('<br /><br />',
+                    $tagWriter->errors));
         }
     }
 
diff --git a/app/TrackFile.php b/app/TrackFile.php
index 8a1df20d..e1cf52bf 100644
--- a/app/TrackFile.php
+++ b/app/TrackFile.php
@@ -139,5 +139,7 @@ class TrackFile extends Model
 
         $this->filesize = $size;
         $this->update();
+
+        return $size;
     }
 }
diff --git a/config/ponyfm.php b/config/ponyfm.php
index 7ae9f250..1470dcd4 100644
--- a/config/ponyfm.php
+++ b/config/ponyfm.php
@@ -59,10 +59,10 @@ return [
     | Cache Duration
     |--------------------------------------------------------------------------
     |
-    | Duration in minutes for tracks to be stored in cache.
+    | Duration in minutes for track files to be stored in cache.
     |
     */
 
-    'cache_duration' => 1440,
+    'track_file_cache_duration' => 1440,
 
 ];
diff --git a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
index 69aff5a1..746f5bce 100644
--- a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
+++ b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
@@ -32,8 +32,8 @@ class UpdateTrackFilesWithCache extends Migration
     {
         Schema::table('track_files', function (Blueprint $table) {
             $table->boolean('is_cacheable')->default(false);
-            $table->boolean('in_progress')->default(false);
-            $table->dateTime('expiration')->nullable();
+            $table->boolean('is_in_progress')->default(false);
+            $table->dateTime('expires_at')->nullable();
         });
     }
 
diff --git a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
index d62a4244..70f80ef4 100644
--- a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
+++ b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php
@@ -18,8 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Artisan;
 
 class UpdateTrackFilesWithFilesize extends Migration
 {
@@ -33,6 +34,11 @@ class UpdateTrackFilesWithFilesize extends Migration
         Schema::table('track_files', function (Blueprint $table) {
             $table->integer('filesize')->nullable()->unsigned();
         });
+
+        // Populate file sizes
+        Artisan::call('rebuild:filesizes', [
+            '--force' => true,
+        ]);
     }
 
     /**
diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html
index 9c5d64f5..ea5c3c5f 100644
--- a/public/templates/albums/show.html
+++ b/public/templates/albums/show.html
@@ -5,12 +5,18 @@
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="album.is_downloadable == 1">
-                <li bindonce ng-repeat="format in album.formats" ng-hide="isEncoding">
-                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
-                    <a ng-if="format.isCacheable" ng-click="getCachedAlbum(album.id, format.name);" href=""><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                <li bindonce ng-repeat="format in album.formats" ng-hide="isInProgress">
+                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url">
+                        <span bo-text="format.name"></span>
+                        <small bo-text="'(' + format.size + ')'"></small>
+                    </a>
+                    <a ng-if="format.isCacheable" ng-click="getCachedAlbum(album.id, format.name);" href="">
+                        <span bo-text="format.name"></span>
+                        <small bo-text="'(' + format.size + ')'"></small>
+                    </a>
                 </li>
-                <li ng-show="isEncoding" class="cache-loading"><img src="/images/loading.gif" /></li>
-                <li ng-show="isEncoding" class="cache-loading"><small>We&#39;re getting your download ready! This may take up to a few minutes .</small></li>
+                <li ng-show="isInProgress" class="cache-loading"><img src="/images/loading.gif" /></li>
+                <li ng-show="isInProgress" class="cache-loading"><small>We&#39;re getting your download ready! This may take up to a few minutes .</small></li>
             </ul>
         </li>
         <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li>
diff --git a/public/templates/tracks/show.html b/public/templates/tracks/show.html
index e01209aa..9ef0ec11 100644
--- a/public/templates/tracks/show.html
+++ b/public/templates/tracks/show.html
@@ -5,12 +5,18 @@
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="track.is_downloadable == 1">
-                <li bindonce ng-repeat="format in track.formats" ng-hide="isEncoding">
-                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
-                    <a ng-if="format.isCacheable" ng-click="getCachedTrack(track.id, format.name);" href=""><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                <li bindonce ng-repeat="format in track.formats" ng-hide="isInProgress">
+                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url">
+                        <span bo-text="format.name"></span>
+                        <small bo-text="'(' + format.size + ')'"></small>
+                    </a>
+                    <a ng-if="format.isCacheable" ng-click="getCachedTrack(track.id, format.name);" href="">
+                        <span bo-text="format.name"></span>
+                        <small bo-text="'(' + format.size + ')'"></small>
+                    </a>
                 </li>
-                <li ng-show="isEncoding" class="cache-loading"><img src="/images/loading.gif" /></li>
-                <li ng-show="isEncoding" class="cache-loading"><small>We&#39;re getting your download ready! This'll take a few seconds.</small></li>
+                <li ng-show="isInProgress" class="cache-loading"><img src="/images/loading.gif" /></li>
+                <li ng-show="isInProgress" class="cache-loading"><small>We&#39;re getting your download ready! This'll take a few seconds.</small></li>
             </ul>
         </li>
         <li class="dropdown">
diff --git a/resources/assets/scripts/app/controllers/album.coffee b/resources/assets/scripts/app/controllers/album.coffee
index 1815ea96..3f5fd837 100644
--- a/resources/assets/scripts/app/controllers/album.coffee
+++ b/resources/assets/scripts/app/controllers/album.coffee
@@ -42,16 +42,15 @@ angular.module('ponyfm').controller "album", [
                 $scope.playlists.push list for list in lists
 
         $scope.getCachedAlbum = (id, format) ->
-            $scope.isEncoding = true
+            $scope.isInProgress = true
 
             cachedAlbum.download('albums', id, format).then (response) ->
-                albumUrl = response
-                $scope.albumUrl = albumUrl
-                if albumUrl == 'error'
-                    $scope.isEncoding = false
-                else if albumUrl == 'pending'
+                $scope.albumUrl = response
+                if $scope.albumUrl == 'error'
+                    $scope.isInProgress = false
+                else if $scope.albumUrl == 'pending'
                     $timeout $scope.getCachedAlbum(id, format), 5000
                 else
-                    $scope.isEncoding = false
-                    $window.open albumUrl, '_blank'
+                    $scope.isInProgress = false
+                    $window.open $scope.albumUrl, '_blank'
 ]
diff --git a/resources/assets/scripts/app/controllers/track.coffee b/resources/assets/scripts/app/controllers/track.coffee
index 76cb49fb..369d4def 100644
--- a/resources/assets/scripts/app/controllers/track.coffee
+++ b/resources/assets/scripts/app/controllers/track.coffee
@@ -74,17 +74,15 @@ angular.module('ponyfm').controller "track", [
                 playlist.message = res.message
 
         $scope.getCachedTrack = (id, format) ->
-          $scope.isEncoding = true
+          $scope.isInProgress = true
 
           cachedTrack.download('tracks', id, format).then (response) ->
-            trackUrl = response
-            $scope.trackUrl = trackUrl
-            console.log(trackUrl);
-            if trackUrl == 'error'
-              $scope.isEncoding = false
-            else if trackUrl == 'pending'
+            $scope.trackUrl = response
+            if $scope.trackUrl == 'error'
+              $scope.isInProgress = false
+            else if $scope.trackUrl == 'pending'
               $timeout $scope.getCachedTrack(id, format), 5000
             else
-              $scope.isEncoding = false
-              $window.open trackUrl, '_blank'
+              $scope.isInProgress = false
+              $window.open $scope.trackUrl, '_blank'
 ]
diff --git a/resources/assets/scripts/app/services/download-cached.coffee b/resources/assets/scripts/app/services/download-cached.coffee
index cbb09b6f..a76c311d 100644
--- a/resources/assets/scripts/app/services/download-cached.coffee
+++ b/resources/assets/scripts/app/services/download-cached.coffee
@@ -18,7 +18,7 @@ angular.module('ponyfm').factory('download-cached', [
   '$rootScope', '$http', '$log'
   ($rootScope, $http, $log) ->
     download = (type, id, format) ->
-      url = '/api/web/' + type + '/cached/' + id + '/' + format
+      url = "/api/web/#{type}/cached/#{id}/#{format}"
 
       encodingComplete = (response) ->
         if response.data.url == null
diff --git a/resources/assets/styles/content.less b/resources/assets/styles/content.less
index b937aa45..7423f206 100644
--- a/resources/assets/styles/content.less
+++ b/resources/assets/styles/content.less
@@ -360,6 +360,7 @@ html {
         background-color: lighten(@pfm-purple, 30%);
       }
     }
+
     .cache-loading {
       display: block;
       margin-left: auto;

From b441a5881914cf428da04f47a1653db11dc1db6c Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 2 Nov 2015 20:15:26 -0800
Subject: [PATCH 32/44] #4: Keep the dropdown menu open after selecting a track
 or album download in a cacheable format.

---
 public/templates/albums/show.html             |  2 +-
 public/templates/tracks/show.html             |  2 +-
 .../scripts/app/controllers/album.coffee      |  2 +-
 .../scripts/app/controllers/track.coffee      | 20 +++++++++----------
 .../scripts/base/ui-bootstrap-tpls-0.4.0.js   | 19 ++++++++++++++++++
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html
index ea5c3c5f..530c70ac 100644
--- a/public/templates/albums/show.html
+++ b/public/templates/albums/show.html
@@ -1,7 +1,7 @@
 <div class="resource-details album-details" bindonce="album">
     <ul class="dropdowns">
         <li class="dropdown">
-            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="album.is_downloadable == 0">
+            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="album.is_downloadable == 0" auto-close="outsideClick">
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="album.is_downloadable == 1">
diff --git a/public/templates/tracks/show.html b/public/templates/tracks/show.html
index 9ef0ec11..d7bac977 100644
--- a/public/templates/tracks/show.html
+++ b/public/templates/tracks/show.html
@@ -1,7 +1,7 @@
 <div class="resource-details track-details" bindonce="track">
     <ul class="dropdowns">
         <li class="dropdown">
-            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="track.is_downloadable == 0">
+            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="track.is_downloadable == 0" auto-close="outsideClick">
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="track.is_downloadable == 1">
diff --git a/resources/assets/scripts/app/controllers/album.coffee b/resources/assets/scripts/app/controllers/album.coffee
index 3f5fd837..6e1db071 100644
--- a/resources/assets/scripts/app/controllers/album.coffee
+++ b/resources/assets/scripts/app/controllers/album.coffee
@@ -52,5 +52,5 @@ angular.module('ponyfm').controller "album", [
                     $timeout $scope.getCachedAlbum(id, format), 5000
                 else
                     $scope.isInProgress = false
-                    $window.open $scope.albumUrl, '_blank'
+                    $window.open $scope.albumUrl
 ]
diff --git a/resources/assets/scripts/app/controllers/track.coffee b/resources/assets/scripts/app/controllers/track.coffee
index 369d4def..97393695 100644
--- a/resources/assets/scripts/app/controllers/track.coffee
+++ b/resources/assets/scripts/app/controllers/track.coffee
@@ -74,15 +74,15 @@ angular.module('ponyfm').controller "track", [
                 playlist.message = res.message
 
         $scope.getCachedTrack = (id, format) ->
-          $scope.isInProgress = true
+            $scope.isInProgress = true
 
-          cachedTrack.download('tracks', id, format).then (response) ->
-            $scope.trackUrl = response
-            if $scope.trackUrl == 'error'
-              $scope.isInProgress = false
-            else if $scope.trackUrl == 'pending'
-              $timeout $scope.getCachedTrack(id, format), 5000
-            else
-              $scope.isInProgress = false
-              $window.open $scope.trackUrl, '_blank'
+            cachedTrack.download('tracks', id, format).then (response) ->
+                $scope.trackUrl = response
+                if $scope.trackUrl == 'error'
+                    $scope.isInProgress = false
+                else if $scope.trackUrl == 'pending'
+                    $timeout $scope.getCachedTrack(id, format), 5000
+                else
+                    $scope.isInProgress = false
+                    $window.location = $scope.trackUrl#, '_blank'
 ]
diff --git a/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js b/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js
index 2e9eeb98..5c639c73 100644
--- a/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js
+++ b/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js
@@ -1269,10 +1269,29 @@ angular.module('ui.bootstrap.dropdownToggle', []).directive('dropdownToggle', ['
           element.parent().addClass('open');
           openElement = element;
           closeMenu = function (event) {
+
+            // Dropdowns with with the `auto-close="outsideClick"` attribute are handled differently.
+            // They will only close if the user clicks somewhere outside of the dropdown menu.
+            //
+            // => Partially backported from: https://github.com/angular-ui/bootstrap/pull/3045/files
+            if ('autoClose' in attrs && attrs.autoClose === 'outsideClick') {
+              if (typeof event !== 'undefined' && !element.parent()[0].contains(event.target)) {
+                // Only close the menu if we detect a click outside the element.
+                $document.unbind('click', closeMenu);
+                element.parent().removeClass('open');
+                closeMenu = angular.noop;
+                openElement = null;
+              }
+
+              return;
+            }
+
+            // If this isn't an "outside click", handle it as usual.
             if (event) {
               event.preventDefault();
               event.stopPropagation();
             }
+
             $document.unbind('click', closeMenu);
             element.parent().removeClass('open');
             closeMenu = angular.noop;

From c7bca18b5e7a70aa8eb9405b3758a6b6becef55c Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 2 Nov 2015 20:28:39 -0800
Subject: [PATCH 33/44] Added AAC to the list of cacheable formats and wrote
 some inline documentation.

---
 app/Track.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/Track.php b/app/Track.php
index 352d54a5..0a25d422 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -93,9 +93,21 @@ class Track extends Model
         ],
     ];
 
+    /**
+     * `TrackFiles` in these formats, with the exception of any master files, will
+     * be generated upon user request and kept around temporarily.
+     *
+     * After updating this array, run `php artisan rebuild:track-cache` to bring
+     * the track store into a consistent state.
+     *
+     * The strings in this array must match keys in the `Track::$Formats` array.
+     *
+     * @var array
+     */
     public static $CacheableFormats = [
         'OGG Vorbis',
         'ALAC',
+        'AAC'
     ];
 
     public static function summary()

From 9cff18f5fc3293b9706d32f1d97c5a8a286c1033 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 2 Nov 2015 20:48:15 -0800
Subject: [PATCH 34/44] #4: Removed a line of dead code and fixed the rebuild
 process for deleted tracks.

---
 app/Jobs/EncodeTrackFile.php | 1 -
 app/TrackFile.php            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
index 9f535517..2b135556 100644
--- a/app/Jobs/EncodeTrackFile.php
+++ b/app/Jobs/EncodeTrackFile.php
@@ -75,7 +75,6 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
             ->getFile();
 
         // Assign the target
-        $destination = $this->trackFile->track->getDirectory();
         $this->trackFile->track->ensureDirectoryExists();
         $target = $this->trackFile->getFile();
 
diff --git a/app/TrackFile.php b/app/TrackFile.php
index e1cf52bf..d7a35855 100644
--- a/app/TrackFile.php
+++ b/app/TrackFile.php
@@ -31,7 +31,7 @@ class TrackFile extends Model
 {
     public function track()
     {
-        return $this->belongsTo('Poniverse\Ponyfm\Track');
+        return $this->belongsTo('Poniverse\Ponyfm\Track')->withTrashed();
     }
 
     /**

From 41bcdcaf911348e468c8cccceaffa07cd1825fa7 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Sat, 7 Nov 2015 17:01:53 +0000
Subject: [PATCH 35/44] #4: Cast track output formats to correct types

---
 app/Track.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Track.php b/app/Track.php
index d61f0321..7afa25b5 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -243,7 +243,7 @@ class Track extends Model
                 'extension' => $trackFile->extension,
                 'url' => $trackFile->url,
                 'size' => $trackFile->size,
-                'isCacheable' => $trackFile->is_cacheable
+                'isCacheable' => (bool) $trackFile->is_cacheable
             ];
         }
 

From 90e369e6b8812a7278d1e9bb05bfbb5bb92115d1 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Sun, 8 Nov 2015 14:03:44 +0000
Subject: [PATCH 36/44] #17: Add index to is_cacheable

---
 .../2015_10_26_192855_update_track_files_with_cache.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
index 746f5bce..a67132b4 100644
--- a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
+++ b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
@@ -32,6 +32,7 @@ class UpdateTrackFilesWithCache extends Migration
     {
         Schema::table('track_files', function (Blueprint $table) {
             $table->boolean('is_cacheable')->default(false);
+            $table->index('is_cacheable');
             $table->boolean('is_in_progress')->default(false);
             $table->dateTime('expires_at')->nullable();
         });

From 6c5155f5832d78a0b7050685f23cd81091c9bea8 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Sun, 8 Nov 2015 17:46:35 +0000
Subject: [PATCH 37/44] #4: Implement cached playlist downloads

---
 app/Album.php                                 |  2 +-
 .../Controllers/Api/Web/AlbumsController.php  |  2 +-
 .../Api/Web/PlaylistsController.php           | 36 +++++++
 app/Http/routes.php                           |  5 +-
 app/Playlist.php                              | 93 ++++++++++++++++---
 public/templates/albums/show.html             |  2 +-
 public/templates/playlists/show.html          | 13 ++-
 .../scripts/app/controllers/playlist.coffee   | 18 +++-
 8 files changed, 149 insertions(+), 22 deletions(-)

diff --git a/app/Album.php b/app/Album.php
index a6b8c7be..9c5d2bc3 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -282,7 +282,7 @@ class Album extends Model
         return $trackCount;
     }
 
-    public function countCacheableTrackFiles($format)
+    public function countCachedTrackFiles($format)
     {
         $cachedCount = 0;
 
diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index c2536145..67b0b98d 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -102,7 +102,7 @@ class AlbumsController extends ApiControllerBase
 
         $trackCount = $album->countDownloadableTracks();
         try {
-            $cachedCount = $album->countCacheableTrackFiles($format);
+            $cachedCount = $album->countCachedTrackFiles($format);
         } catch (ModelNotFoundException $e) {
             return $this->notFound('Track file in album not found!');
         }
diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php
index 7ed44d91..246d2724 100644
--- a/app/Http/Controllers/Api/Web/PlaylistsController.php
+++ b/app/Http/Controllers/Api/Web/PlaylistsController.php
@@ -20,6 +20,7 @@
 
 namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Poniverse\Ponyfm\Commands\AddTrackToPlaylistCommand;
 use Poniverse\Ponyfm\Commands\CreatePlaylistCommand;
 use Poniverse\Ponyfm\Commands\DeletePlaylistCommand;
@@ -31,6 +32,7 @@ use Poniverse\Ponyfm\ResourceLogItem;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
+use Poniverse\Ponyfm\Track;
 
 class PlaylistsController extends ApiControllerBase
 {
@@ -110,6 +112,40 @@ class PlaylistsController extends ApiControllerBase
         return Response::json(Playlist::mapPublicPlaylistShow($playlist), 200);
     }
 
+    public function getCachedPlaylist($id, $format)
+    {
+        // Validation
+        try {
+            $playlist = Playlist::with('tracks.trackFiles')->findOrFail($id);
+        } catch (ModelNotFoundException $e) {
+            return $this->notFound('Playlist not found!');
+        }
+
+        if ((!$playlist->is_public && !Auth::check()) || (!$playlist->is_public && ($playlist->user_id !== Auth::user()->id))) {
+            return $this->notFound('Playlist not found!');
+        }
+
+        if (!in_array($format, Track::$CacheableFormats)) {
+            return $this->notFound('Format not found!');
+        }
+
+        $trackCount = $playlist->countDownloadableTracks();
+        try {
+            $cachedCount = $playlist->countCachedTrackFiles($format);
+        } catch (ModelNotFoundException $e) {
+            return $this->notFound('Track file in playlist not found!');
+        }
+
+        if ($trackCount === $cachedCount) {
+            $url = $playlist->getDownloadUrl($format);
+        } else {
+            $playlist->encodeCacheableTrackFiles($format);
+            $url = null;
+        }
+
+        return Response::json(['url' => $url], 200);
+    }
+
     public function getPinned()
     {
         $query = Playlist
diff --git a/app/Http/routes.php b/app/Http/routes.php
index a2358339..a4e4cd07 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -79,14 +79,15 @@ Route::group(['prefix' => 'api/web'], function() {
 
     Route::get('/tracks', 'Api\Web\TracksController@getIndex');
     Route::get('/tracks/{id}', 'Api\Web\TracksController@getShow')->where('id', '\d+');
-    Route::get('/tracks/cached/{id}/{format}', 'Api\Web\TracksController@getCachedTrack')->where(['id' => '\d+', 'name' => '.+']);
+    Route::get('/tracks/cached/{id}/{format}', 'Api\Web\TracksController@getCachedTrack')->where(['id' => '\d+', 'format' => '.+']);
 
     Route::get('/albums', 'Api\Web\AlbumsController@getIndex');
     Route::get('/albums/{id}', 'Api\Web\AlbumsController@getShow')->where('id', '\d+');
-    Route::get('/albums/cached/{id}/{format}', 'Api\Web\AlbumsController@getCachedAlbum')->where(['id' => '\d+', 'name' => '.+']);
+    Route::get('/albums/cached/{id}/{format}', 'Api\Web\AlbumsController@getCachedAlbum')->where(['id' => '\d+', 'format' => '.+']);
 
     Route::get('/playlists', 'Api\Web\PlaylistsController@getIndex');
     Route::get('/playlists/{id}', 'Api\Web\PlaylistsController@getShow')->where('id', '\d+');
+    Route::get('/playlists/cached/{id}/{format}', 'Api\Web\PlaylistsController@getCachedPlaylist')->where(['id' => '\d+', 'format' => '.+']);
 
     Route::get('/comments/{type}/{id}', 'Api\Web\CommentsController@getIndex')->where('id', '\d+');
 
diff --git a/app/Playlist.php b/app/Playlist.php
index f3621122..216b0cb1 100644
--- a/app/Playlist.php
+++ b/app/Playlist.php
@@ -20,19 +20,23 @@
 
 namespace Poniverse\Ponyfm;
 
+use File;
 use Helpers;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\URL;
+use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 
 class Playlist extends Model
 {
-    protected $table = 'playlists';
+    use SoftDeletes, SlugTrait, DispatchesJobs;
 
-    use SoftDeletes, SlugTrait;
+    protected $table = 'playlists';
 
     protected $dates = ['deleted_at'];
 
@@ -68,7 +72,8 @@ class Playlist extends Model
                 'name' => $name,
                 'extension' => $format['extension'],
                 'url' => $playlist->getDownloadUrl($name),
-                'size' => Helpers::formatBytes($playlist->getFilesize($name))
+                'size' => Helpers::formatBytes($playlist->getFilesize($name)),
+                'isCacheable' => (in_array($name, Track::$CacheableFormats) ? true : false)
             ];
         }
 
@@ -104,25 +109,25 @@ class Playlist extends Model
             $userRow = $playlist->users[0];
             $userData = [
                 'stats' => [
-                    'views' => (int) $userRow->view_count,
-                    'downloads' => (int) $userRow->download_count,
+                    'views' => (int)$userRow->view_count,
+                    'downloads' => (int)$userRow->download_count,
                 ],
-                'is_favourited' => (bool) $userRow->is_favourited
+                'is_favourited' => (bool)$userRow->is_favourited
             ];
         }
 
         return [
-            'id' => (int) $playlist->id,
+            'id' => (int)$playlist->id,
             'track_count' => $playlist->track_count,
             'title' => $playlist->title,
             'slug' => $playlist->slug,
             'created_at' => $playlist->created_at,
-            'is_public' => (bool) $playlist->is_public,
+            'is_public' => (bool)$playlist->is_public,
             'stats' => [
-                'views' => (int) $playlist->view_count,
-                'downloads' => (int) $playlist->download_count,
-                'comments' => (int) $playlist->comment_count,
-                'favourites' => (int) $playlist->favourite_count
+                'views' => (int)$playlist->view_count,
+                'downloads' => (int)$playlist->download_count,
+                'comments' => (int)$playlist->comment_count,
+                'favourites' => (int)$playlist->favourite_count
             ],
             'covers' => [
                 'small' => $playlist->getCoverUrl(Image::SMALL),
@@ -130,7 +135,7 @@ class Playlist extends Model
             ],
             'url' => $playlist->url,
             'user' => [
-                'id' => (int) $playlist->user->id,
+                'id' => (int)$playlist->user->id,
                 'name' => $playlist->user->display_name,
                 'url' => $playlist->user->url,
             ],
@@ -197,6 +202,63 @@ class Playlist extends Model
         return URL::to('p' . $this->id . '/dl.' . Track::$Formats[$format]['extension']);
     }
 
+    public function countDownloadableTracks()
+    {
+        $trackCount = 0;
+
+        foreach ($this->tracks as $track) {
+            if ($track->is_downloadable == true) {
+                $trackCount++;
+            } else {
+                continue;
+            }
+        }
+
+        return $trackCount;
+    }
+
+    public function countCachedTrackFiles($format)
+    {
+        $cachedCount = 0;
+
+        foreach ($this->tracks as $track) {
+            if ($track->is_downloadable == false) {
+                continue;
+            }
+
+            try {
+                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
+            } catch (ModelNotFoundException $e) {
+                throw $e;
+            }
+
+            if ($trackFile->expires_at != null && File::exists($trackFile->getFile())) {
+                $cachedCount++;
+            }
+        }
+
+        return $cachedCount;
+    }
+
+    public function encodeCacheableTrackFiles($format)
+    {
+        foreach ($this->tracks as $track) {
+            if ($track->is_downloadable == false) {
+                continue;
+            }
+
+            try {
+                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
+            } catch (ModelNotFoundException $e) {
+                throw $e;
+            }
+
+            if (!File::exists($trackFile->getFile()) && $trackFile->is_in_progress != true) {
+                $this->dispatch(new EncodeTrackFile($trackFile, true));
+            }
+        }
+    }
+
     public function getFilesize($format)
     {
         $tracks = $this->tracks;
@@ -207,7 +269,10 @@ class Playlist extends Model
         return Cache::remember($this->getCacheKey('filesize-' . $format), 1440, function () use ($tracks, $format) {
             $size = 0;
             foreach ($tracks as $track) {
-                $size += $track->getFilesize($format);
+                // Ensure that only downloadable tracks are added onto the file size
+                if ($track->is_downloadable == 1) {
+                    $size += $track->getFilesize($format);
+                }
             }
 
             return $size;
diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html
index 530c70ac..704aea0e 100644
--- a/public/templates/albums/show.html
+++ b/public/templates/albums/show.html
@@ -16,7 +16,7 @@
                     </a>
                 </li>
                 <li ng-show="isInProgress" class="cache-loading"><img src="/images/loading.gif" /></li>
-                <li ng-show="isInProgress" class="cache-loading"><small>We&#39;re getting your download ready! This may take up to a few minutes .</small></li>
+                <li ng-show="isInProgress" class="cache-loading"><small>We&#39;re getting your download ready! This may take up to a few minutes.</small></li>
             </ul>
         </li>
         <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li>
diff --git a/public/templates/playlists/show.html b/public/templates/playlists/show.html
index 4dcf9a69..57a2d2f8 100644
--- a/public/templates/playlists/show.html
+++ b/public/templates/playlists/show.html
@@ -5,7 +5,18 @@
                 Downloads
             </a>
             <ul class="dropdown-menu">
-                <li bindonce ng-repeat="format in playlist.formats"><a target="_blank" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a></li>
+                <li bindonce ng-repeat="format in playlist.formats" ng-hide="isInProgress">
+                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url">
+                        <span bo-text="format.name"></span>
+                        <small bo-text="'(' + format.size + ')'"></small>
+                    </a>
+                    <a ng-if="format.isCacheable" ng-click="getCachedPlaylist(playlist.id, format.name);" href="">
+                        <span bo-text="format.name"></span>
+                        <small bo-text="'(' + format.size + ')'"></small>
+                    </a>
+                </li>
+                <li ng-show="isInProgress" class="cache-loading"><img src="/images/loading.gif" /></li>
+                <li ng-show="isInProgress" class="cache-loading"><small>We&#39;re getting your download ready! This may take up to a few minutes.</small></li>
             </ul>
         </li>
         <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li>
diff --git a/resources/assets/scripts/app/controllers/playlist.coffee b/resources/assets/scripts/app/controllers/playlist.coffee
index 6180ab2c..2f39e744 100644
--- a/resources/assets/scripts/app/controllers/playlist.coffee
+++ b/resources/assets/scripts/app/controllers/playlist.coffee
@@ -21,8 +21,8 @@ window.pfm.preloaders['playlist'] = [
 ]
 
 angular.module('ponyfm').controller 'playlist', [
-    '$scope', '$state', 'playlists', '$dialog'
-    ($scope, $state, playlists, $dialog) ->
+    '$scope', '$state', 'playlists', '$dialog', 'download-cached', '$window', '$timeout'
+    ($scope, $state, playlists, $dialog, cachedPlaylist, $window, $timeout) ->
         playlist = null
 
         playlists.fetch($state.params.id).done (playlistResponse) ->
@@ -34,4 +34,18 @@ angular.module('ponyfm').controller 'playlist', [
                 templateUrl: '/templates/partials/playlist-share-dialog.html',
                 controller: ['$scope', ($scope) -> $scope.playlist = playlist; $scope.close = () -> dialog.close()]
             dialog.open()
+
+        $scope.getCachedPlaylist = (id, format) ->
+            $scope.isInProgress = true
+
+            cachedPlaylist.download('playlists', id, format).then (response) ->
+                $scope.playlistUrl = response
+                if $scope.playlistUrl == 'error'
+                    $scope.isInProgress = false
+                else if $scope.playlistUrl == 'pending'
+                    $timeout $scope.getCachedPlaylist(id, format), 5000
+                else
+                    $scope.isInProgress = false
+                    $window.open $scope.playlistUrl
 ]
+

From a46882d9289df5708101b772597ee5dba97e64f5 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <me@iamkelv.in>
Date: Sun, 8 Nov 2015 17:55:00 +0000
Subject: [PATCH 38/44] #17/#4: Add dropdown box persistence with to playlists

---
 public/templates/playlists/show.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/playlists/show.html b/public/templates/playlists/show.html
index 57a2d2f8..5b39422f 100644
--- a/public/templates/playlists/show.html
+++ b/public/templates/playlists/show.html
@@ -1,7 +1,7 @@
 <div class="resource-details playlist-details" bindonce="playlist">
     <ul class="dropdowns">
         <li class="dropdown">
-            <a href="#" class="btn btn-small btn-info dropdown-toggle">
+            <a href="#" class="btn btn-small btn-info dropdown-toggle" auto-close="outsideClick">
                 Downloads
             </a>
             <ul class="dropdown-menu">

From b7f2b625878ded2ca8e4d463ad05bc213767d42a Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <github@iamkelv.in>
Date: Mon, 9 Nov 2015 13:16:03 +0000
Subject: [PATCH 39/44] #4: Add indexes to track_files migration

---
 .../2015_10_26_192855_update_track_files_with_cache.php      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
index a67132b4..5e8c1b0d 100644
--- a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
+++ b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
@@ -31,10 +31,9 @@ class UpdateTrackFilesWithCache extends Migration
     public function up()
     {
         Schema::table('track_files', function (Blueprint $table) {
-            $table->boolean('is_cacheable')->default(false);
-            $table->index('is_cacheable');
+            $table->boolean('is_cacheable')->default(false)->index();
             $table->boolean('is_in_progress')->default(false);
-            $table->dateTime('expires_at')->nullable();
+            $table->dateTime('expires_at')->nullable()->index();
         });
     }
 

From 214880ec2c1c86ffa3c3bff0563bfdfe5b8fe16e Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <github@iamkelv.in>
Date: Mon, 9 Nov 2015 13:17:58 +0000
Subject: [PATCH 40/44] #4: Remove re-thrown ModelNotFoundException

---
 app/Playlist.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Playlist.php b/app/Playlist.php
index 216b0cb1..8d8ac4ec 100644
--- a/app/Playlist.php
+++ b/app/Playlist.php
@@ -226,11 +226,7 @@ class Playlist extends Model
                 continue;
             }
 
-            try {
-                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
-            } catch (ModelNotFoundException $e) {
-                throw $e;
-            }
+            $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
 
             if ($trackFile->expires_at != null && File::exists($trackFile->getFile())) {
                 $cachedCount++;

From 3456e6b499a239006891e7637571243741f42a3a Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 9 Nov 2015 20:08:37 -0800
Subject: [PATCH 41/44] #4: Fixed playlists that have a mix of lossy and
 lossless master files, added a bunch of typehinting, and fixed the reversal
 of a migration.

---
 app/Album.php                                 | 35 +++++++++++++++----
 app/Exceptions.php                            | 14 ++++++++
 app/Playlist.php                              | 25 +++++++++----
 app/Track.php                                 | 24 ++++++++++---
 app/TrackFile.php                             | 11 +++---
 ...6_192855_update_track_files_with_cache.php |  4 +--
 6 files changed, 87 insertions(+), 26 deletions(-)
 create mode 100644 app/Exceptions.php

diff --git a/app/Album.php b/app/Album.php
index 9c5d2bc3..26858b76 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -26,10 +26,10 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\URL;
+use Auth;
+use Cache;
+use File;
+use URL;
 use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 
@@ -90,7 +90,7 @@ class Album extends Model
         return $this->hasMany('Poniverse\Ponyfm\Comment')->orderBy('created_at', 'desc');
     }
 
-    public static function mapPublicAlbumShow($album)
+    public static function mapPublicAlbumShow(Album $album)
     {
         $tracks = [];
         foreach ($album->tracks as $track) {
@@ -136,7 +136,7 @@ class Album extends Model
         return $data;
     }
 
-    public static function mapPublicAlbumSummary($album)
+    public static function mapPublicAlbumSummary(Album $album)
     {
         $userData = [
             'stats' => [
@@ -211,10 +211,18 @@ class Album extends Model
 
         return Cache::remember($this->getCacheKey('filesize-' . $format), 1440, function () use ($tracks, $format) {
             $size = 0;
+
             foreach ($tracks as $track) {
+                /** @var $track Track */
+
                 // Ensure that only downloadable tracks are added onto the file size
                 if ($track->is_downloadable == 1) {
-                    $size += $track->getFilesize($format);
+                    try {
+                        $size += $track->getFilesize($format);
+
+                    } catch (TrackFileNotFoundException $e) {
+                        // do nothing - this track won't be included in the download
+                    }
                 }
             }
 
@@ -260,6 +268,8 @@ class Album extends Model
         $index = 1;
 
         foreach ($tracks as $track) {
+            /** @var $track Track */
+
             $track->track_number = $index;
             $index++;
             $track->updateTags();
@@ -287,6 +297,9 @@ class Album extends Model
         $cachedCount = 0;
 
         foreach ($this->tracks as $track) {
+            /** @var $track Track */
+
+
             if ($track->is_downloadable == false) {
                 continue;
             }
@@ -308,6 +321,8 @@ class Album extends Model
     public function encodeCacheableTrackFiles($format)
     {
         foreach ($this->tracks as $track) {
+            /** @var $track Track */
+
             if ($track->is_downloadable == false) {
                 continue;
             }
@@ -363,7 +378,9 @@ class Album extends Model
                 continue;
             }
 
+            /** @var $track Track */
             $track = Track::find($trackId);
+
             if ($track->album_id != null && $track->album_id != $this->id) {
                 $albumsToFix[] = $track->album;
             }
@@ -378,6 +395,8 @@ class Album extends Model
         }
 
         foreach ($tracksToRemove as $track) {
+            /** @var $track Track */
+
             $track->album_id = null;
             $track->track_number = null;
             $track->updateTags();
@@ -385,6 +404,8 @@ class Album extends Model
         }
 
         foreach ($albumsToFix as $album) {
+            /** @var $album Album */
+
             $album->updateTrackNumbers();
         }
 
diff --git a/app/Exceptions.php b/app/Exceptions.php
new file mode 100644
index 00000000..94afa01b
--- /dev/null
+++ b/app/Exceptions.php
@@ -0,0 +1,14 @@
+<?php namespace Poniverse\Ponyfm;
+
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+/**
+ * Class TrackFileNotFoundException
+ * @package Poniverse\Ponyfm
+ *
+ * This exception is used to indicate that the requested `TrackFile` object
+ * does not exist. This is useful when dealing with albums or playlists that
+ * contain tracks for which no lossless master is available (and thus, lossless
+ * `TrackFiles` don't exist for).
+ */
+class TrackFileNotFoundException extends ModelNotFoundException {}
diff --git a/app/Playlist.php b/app/Playlist.php
index 8d8ac4ec..e68eb981 100644
--- a/app/Playlist.php
+++ b/app/Playlist.php
@@ -26,9 +26,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\URL;
+use Auth;
+use Cache;
+use URL;
 use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 
@@ -59,10 +59,12 @@ class Playlist extends Model
         return !$query;
     }
 
-    public static function mapPublicPlaylistShow($playlist)
+    public static function mapPublicPlaylistShow(Playlist $playlist)
     {
         $tracks = [];
         foreach ($playlist->tracks as $track) {
+            /** @var $track Track */
+
             $tracks[] = Track::mapPublicTrackSummary($track);
         }
 
@@ -95,7 +97,7 @@ class Playlist extends Model
         return $data;
     }
 
-    public static function mapPublicPlaylistSummary($playlist)
+    public static function mapPublicPlaylistSummary(Playlist $playlist)
     {
         $userData = [
             'stats' => [
@@ -222,6 +224,8 @@ class Playlist extends Model
         $cachedCount = 0;
 
         foreach ($this->tracks as $track) {
+            /** @var $track Track */
+
             if ($track->is_downloadable == false) {
                 continue;
             }
@@ -239,6 +243,8 @@ class Playlist extends Model
     public function encodeCacheableTrackFiles($format)
     {
         foreach ($this->tracks as $track) {
+            /** @var $track Track */
+
             if ($track->is_downloadable == false) {
                 continue;
             }
@@ -265,9 +271,16 @@ class Playlist extends Model
         return Cache::remember($this->getCacheKey('filesize-' . $format), 1440, function () use ($tracks, $format) {
             $size = 0;
             foreach ($tracks as $track) {
+                /** @var $track Track */
+
                 // Ensure that only downloadable tracks are added onto the file size
                 if ($track->is_downloadable == 1) {
-                    $size += $track->getFilesize($format);
+                    try {
+                        $size += $track->getFilesize($format);
+
+                    } catch (TrackFileNotFoundException $e) {
+                        // do nothing - this track won't be included in the download
+                    }
                 }
             }
 
diff --git a/app/Track.php b/app/Track.php
index 7afa25b5..09604f20 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -24,6 +24,7 @@ use Auth;
 use Cache;
 use Config;
 use DB;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 use Exception;
 use External;
@@ -214,7 +215,7 @@ class Track extends Model
         return $processed;
     }
 
-    public static function mapPublicTrackShow($track)
+    public static function mapPublicTrackShow(Track $track)
     {
         $returnValue = self::mapPublicTrackSummary($track);
         $returnValue['description'] = $track->description;
@@ -261,7 +262,7 @@ class Track extends Model
         return $returnValue;
     }
 
-    public static function mapPublicTrackSummary($track)
+    public static function mapPublicTrackSummary(Track $track)
     {
         $userData = [
             'stats' => [
@@ -333,7 +334,7 @@ class Track extends Model
         ];
     }
 
-    public static function mapPrivateTrackShow($track)
+    public static function mapPrivateTrackShow(Track $track)
     {
         $showSongs = [];
         foreach ($track->showSongs as $showSong) {
@@ -354,7 +355,7 @@ class Track extends Model
         return $returnValue;
     }
 
-    public static function mapPrivateTrackSummary($track)
+    public static function mapPrivateTrackSummary(Track $track)
     {
         return [
             'id' => $track->id,
@@ -438,9 +439,22 @@ class Track extends Model
         $this->updateHash();
     }
 
+    /**
+     * Returns the size of this track's file in the given format.
+     *
+     * @param $formatName
+     * @return int filesize in bytes
+     * @throws TrackFileNotFoundException
+     */
     public function getFilesize($formatName)
     {
-        return $this->trackFiles()->where('format', $formatName)->first()->filesize;
+        $trackFile = $this->trackFiles()->where('format', $formatName)->first();
+
+        if ($trackFile) {
+            return (int) $trackFile->filesize;
+        } else {
+            throw new TrackFileNotFoundException();
+        }
     }
 
     public function canView($user)
diff --git a/app/TrackFile.php b/app/TrackFile.php
index d7a35855..46c67190 100644
--- a/app/TrackFile.php
+++ b/app/TrackFile.php
@@ -22,10 +22,9 @@ namespace Poniverse\Ponyfm;
 
 use Helpers;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\URL;
+use App;
+use File;
+use URL;
 
 class TrackFile extends Model
 {
@@ -85,9 +84,9 @@ class TrackFile extends Model
         return URL::to('/t' . $this->track_id . '/dl.' . $this->extension);
     }
 
-    public function getSizeAttribute($value)
+    public function getSizeAttribute()
     {
-        return Helpers::formatBytes($this->getFilesize($this->getFile()));
+        return Helpers::formatBytes($this->getFilesize());
     }
 
     public function getFormat()
diff --git a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
index 5e8c1b0d..5352f319 100644
--- a/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
+++ b/database/migrations/2015_10_26_192855_update_track_files_with_cache.php
@@ -46,8 +46,8 @@ class UpdateTrackFilesWithCache extends Migration
     {
         Schema::table('track_files', function (Blueprint $table) {
             $table->dropColumn('is_cacheable');
-            $table->dropColumn('expiration');
-            $table->dropColumn('in_progress');
+            $table->dropColumn('expires_at');
+            $table->dropColumn('is_in_progress');
         });
     }
 }

From c28c887e2941df5a493f9e79e999fe38027c98c4 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 9 Nov 2015 21:49:12 -0800
Subject: [PATCH 42/44] #4: Refactored a bunch of common logic between albums
 and playlists into a trait.

---
 app/Album.php                                 |  72 +---------
 .../Controllers/Api/Web/AlbumsController.php  |  12 +-
 .../Api/Web/PlaylistsController.php           |  11 +-
 app/Playlist.php                              |  69 ++--------
 app/Traits/TrackCollection.php                | 127 ++++++++++++++++++
 5 files changed, 150 insertions(+), 141 deletions(-)
 create mode 100644 app/Traits/TrackCollection.php

diff --git a/app/Album.php b/app/Album.php
index 26858b76..f72ee9ca 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -23,19 +23,17 @@ namespace Poniverse\Ponyfm;
 use Exception;
 use Helpers;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
-use File;
+use Poniverse\Ponyfm\Traits\TrackCollection;
 use URL;
-use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 
 class Album extends Model
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs;
+    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection;
 
     protected $dates = ['deleted_at'];
 
@@ -85,6 +83,10 @@ class Album extends Model
         return $this->hasMany('Poniverse\Ponyfm\Track')->orderBy('track_number', 'asc');
     }
 
+    public function trackFiles() {
+        return $this->hasManyThrough(TrackFile::class, Track::class, 'album_id', 'track_id');
+    }
+
     public function comments()
     {
         return $this->hasMany('Poniverse\Ponyfm\Comment')->orderBy('created_at', 'desc');
@@ -277,68 +279,6 @@ class Album extends Model
         }
     }
 
-    public function countDownloadableTracks()
-    {
-        $trackCount = 0;
-
-        foreach ($this->tracks as $track) {
-            if ($track->is_downloadable == true) {
-                $trackCount++;
-            } else {
-                continue;
-            }
-        }
-
-        return $trackCount;
-    }
-
-    public function countCachedTrackFiles($format)
-    {
-        $cachedCount = 0;
-
-        foreach ($this->tracks as $track) {
-            /** @var $track Track */
-
-
-            if ($track->is_downloadable == false) {
-                continue;
-            }
-
-            try {
-                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
-            } catch (ModelNotFoundException $e) {
-                throw $e;
-            }
-
-            if ($trackFile->expires_at != null && File::exists($trackFile->getFile())) {
-                $cachedCount++;
-            }
-        }
-
-        return $cachedCount;
-    }
-
-    public function encodeCacheableTrackFiles($format)
-    {
-        foreach ($this->tracks as $track) {
-            /** @var $track Track */
-
-            if ($track->is_downloadable == false) {
-                continue;
-            }
-
-            try {
-                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
-            } catch (ModelNotFoundException $e) {
-                throw $e;
-            }
-
-            if (!File::exists($trackFile->getFile()) && $trackFile->is_in_progress != true) {
-                $this->dispatch(new EncodeTrackFile($trackFile, true));
-            }
-        }
-    }
-
     public function syncTrackIds($trackIds)
     {
         $trackIdsInAlbum = [];
diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index 67b0b98d..71f986b2 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -91,7 +91,9 @@ class AlbumsController extends ApiControllerBase
     {
         // Validation
         try {
+            /** @var Album $album */
             $album = Album::with('tracks.trackFiles')->findOrFail($id);
+
         } catch (ModelNotFoundException $e) {
             return $this->notFound('Album not found!');
         }
@@ -100,14 +102,10 @@ class AlbumsController extends ApiControllerBase
             return $this->notFound('Format not found!');
         }
 
-        $trackCount = $album->countDownloadableTracks();
-        try {
-            $cachedCount = $album->countCachedTrackFiles($format);
-        } catch (ModelNotFoundException $e) {
-            return $this->notFound('Track file in album not found!');
-        }
+        $trackCount = $album->countDownloadableTracks($format);
+        $availableFilesCount = $album->countAvailableTrackFiles($format);
 
-        if ($trackCount === $cachedCount) {
+        if ($trackCount === $availableFilesCount) {
             $url = $album->getDownloadUrl($format);
         } else {
             $album->encodeCacheableTrackFiles($format);
diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php
index 246d2724..aac920b3 100644
--- a/app/Http/Controllers/Api/Web/PlaylistsController.php
+++ b/app/Http/Controllers/Api/Web/PlaylistsController.php
@@ -116,6 +116,7 @@ class PlaylistsController extends ApiControllerBase
     {
         // Validation
         try {
+            /** @var $playlist Playlist */
             $playlist = Playlist::with('tracks.trackFiles')->findOrFail($id);
         } catch (ModelNotFoundException $e) {
             return $this->notFound('Playlist not found!');
@@ -129,14 +130,10 @@ class PlaylistsController extends ApiControllerBase
             return $this->notFound('Format not found!');
         }
 
-        $trackCount = $playlist->countDownloadableTracks();
-        try {
-            $cachedCount = $playlist->countCachedTrackFiles($format);
-        } catch (ModelNotFoundException $e) {
-            return $this->notFound('Track file in playlist not found!');
-        }
+        $trackCount = $playlist->countDownloadableTracks($format);
+        $availableFilesCount = $playlist->countAvailableTrackFiles($format);
 
-        if ($trackCount === $cachedCount) {
+        if ($trackCount === $availableFilesCount) {
             $url = $playlist->getDownloadUrl($format);
         } else {
             $playlist->encodeCacheableTrackFiles($format);
diff --git a/app/Playlist.php b/app/Playlist.php
index e68eb981..b30cc7b2 100644
--- a/app/Playlist.php
+++ b/app/Playlist.php
@@ -20,21 +20,19 @@
 
 namespace Poniverse\Ponyfm;
 
-use File;
 use Helpers;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
+use Poniverse\Ponyfm\Traits\TrackCollection;
 use URL;
-use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 
 class Playlist extends Model
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs;
+    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection;
 
     protected $table = 'playlists';
 
@@ -158,6 +156,12 @@ class Playlist extends Model
             ->orderBy('position', 'asc');
     }
 
+    public function trackFiles()
+    {
+        $trackIds = $this->tracks->lists('id');
+        return TrackFile::whereIn('track_id', $trackIds);
+    }
+
     public function users()
     {
         return $this->hasMany('Poniverse\Ponyfm\ResourceUser');
@@ -204,63 +208,6 @@ class Playlist extends Model
         return URL::to('p' . $this->id . '/dl.' . Track::$Formats[$format]['extension']);
     }
 
-    public function countDownloadableTracks()
-    {
-        $trackCount = 0;
-
-        foreach ($this->tracks as $track) {
-            if ($track->is_downloadable == true) {
-                $trackCount++;
-            } else {
-                continue;
-            }
-        }
-
-        return $trackCount;
-    }
-
-    public function countCachedTrackFiles($format)
-    {
-        $cachedCount = 0;
-
-        foreach ($this->tracks as $track) {
-            /** @var $track Track */
-
-            if ($track->is_downloadable == false) {
-                continue;
-            }
-
-            $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
-
-            if ($trackFile->expires_at != null && File::exists($trackFile->getFile())) {
-                $cachedCount++;
-            }
-        }
-
-        return $cachedCount;
-    }
-
-    public function encodeCacheableTrackFiles($format)
-    {
-        foreach ($this->tracks as $track) {
-            /** @var $track Track */
-
-            if ($track->is_downloadable == false) {
-                continue;
-            }
-
-            try {
-                $trackFile = $track->trackFiles()->where('format', $format)->firstOrFail();
-            } catch (ModelNotFoundException $e) {
-                throw $e;
-            }
-
-            if (!File::exists($trackFile->getFile()) && $trackFile->is_in_progress != true) {
-                $this->dispatch(new EncodeTrackFile($trackFile, true));
-            }
-        }
-    }
-
     public function getFilesize($format)
     {
         $tracks = $this->tracks;
diff --git a/app/Traits/TrackCollection.php b/app/Traits/TrackCollection.php
new file mode 100644
index 00000000..2be06db0
--- /dev/null
+++ b/app/Traits/TrackCollection.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ * Copyright (C) 2015 Kelvin Zhang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Traits;
+
+
+use File;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Poniverse\Ponyfm\Jobs\EncodeTrackFile;
+use Poniverse\Ponyfm\TrackFile;
+
+
+/**
+ * Class TrackCollection
+ * @package Poniverse\Ponyfm\Traits
+ *
+ * Contains common logic between albums and playlists. They share some functionality
+ * because they're both a form of downloadable track collection.
+ */
+trait TrackCollection
+{
+    /**
+     * This relation represents all tracks contained by the collection.
+     *
+     * @return Relation
+     */
+    abstract public function tracks();
+
+    /**
+     * This relation represents all track files belonging to this collection's
+     * tracks.
+     *
+     * @return Relation
+     */
+    abstract public function trackFiles();
+
+
+    /**
+     * Returns the number of tracks that are available in the given format.
+     *
+     * @param string $format
+     * @return int the number of downloadable tracks in this collection
+     */
+    public function countDownloadableTracks($format) {
+        return $this->downloadableTrackFiles($format)->count();
+    }
+
+
+    /**
+     * Returns the number of currently-available track files (master files +
+     * currently cached files) for this collection in the given format.
+     *
+     * @param string $format
+     * @return int
+     */
+    public function countAvailableTrackFiles($format) {
+        $trackFiles = $this->downloadableTrackFiles($format);
+        $availableCount = 0;
+
+        foreach ($trackFiles as $trackFile) {
+            /** @var TrackFile $trackFile */
+
+            if (
+                $trackFile->is_master ||
+                ($trackFile->expires_at != null && File::exists($trackFile->getFile()))
+            ) {
+                $availableCount ++;
+            }
+        }
+
+        return $availableCount;
+    }
+
+
+    /**
+     * Kicks off the encoding of any cacheable files in this collection that
+     * do not currently exist.
+     *
+     * @param $format
+     */
+    public function encodeCacheableTrackFiles($format) {
+        $trackFiles = $this->downloadableTrackFiles($format);
+
+        foreach ($trackFiles as $trackFile) {
+            /** @var TrackFile $trackFile */
+
+            if (!File::exists($trackFile->getFile()) && $trackFile->is_in_progress != true) {
+                $this->dispatch(new EncodeTrackFile($trackFile, true));
+            }
+        }
+    }
+
+
+    /**
+     * Returns an Eloquent collection of downloadable TrackFiles for this {@link TrackCollection}.
+     * A {@link TrackFile} is considered downloadable if its associated {@link Track} is.
+     *
+     * @param $format
+     * @return Collection
+     */
+    protected function downloadableTrackFiles($format) {
+        return $this->trackFiles()->with([
+            'track' => function ($query) {
+                $query->where('is_downloadable', true);
+            }
+        ])->where('format', $format)->get();
+    }
+}

From 2d93ed0ef437485999eee03c0184caad606808e4 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 9 Nov 2015 22:29:02 -0800
Subject: [PATCH 43/44] #4: Fixed an error in the cache polling callback.

---
 app/Commands/UploadTrackCommand.php                      | 1 +
 resources/assets/scripts/app/controllers/album.coffee    | 6 +++++-
 resources/assets/scripts/app/controllers/playlist.coffee | 6 +++++-
 resources/assets/scripts/app/controllers/track.coffee    | 8 ++++++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index 776c440f..8f80a510 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -136,6 +136,7 @@ class UploadTrackCommand extends CommandBase
                 $trackFile = new TrackFile();
                 $trackFile->is_master = $name === 'FLAC' ? true : false;
                 $trackFile->format = $name;
+
                 if (in_array($name, Track::$CacheableFormats) && $trackFile->is_master == false) {
                     $trackFile->is_cacheable = true;
                 } else {
diff --git a/resources/assets/scripts/app/controllers/album.coffee b/resources/assets/scripts/app/controllers/album.coffee
index 6e1db071..8c816d91 100644
--- a/resources/assets/scripts/app/controllers/album.coffee
+++ b/resources/assets/scripts/app/controllers/album.coffee
@@ -49,7 +49,11 @@ angular.module('ponyfm').controller "album", [
                 if $scope.albumUrl == 'error'
                     $scope.isInProgress = false
                 else if $scope.albumUrl == 'pending'
-                    $timeout $scope.getCachedAlbum(id, format), 5000
+                    # $timeout takes a callback function
+                    # https://stackoverflow.com/a/23391203/3225811
+                    $timeout(
+                        $scope.getCachedAlbum(id, format)
+                    , 5000)
                 else
                     $scope.isInProgress = false
                     $window.open $scope.albumUrl
diff --git a/resources/assets/scripts/app/controllers/playlist.coffee b/resources/assets/scripts/app/controllers/playlist.coffee
index 2f39e744..c2ab3e2b 100644
--- a/resources/assets/scripts/app/controllers/playlist.coffee
+++ b/resources/assets/scripts/app/controllers/playlist.coffee
@@ -43,7 +43,11 @@ angular.module('ponyfm').controller 'playlist', [
                 if $scope.playlistUrl == 'error'
                     $scope.isInProgress = false
                 else if $scope.playlistUrl == 'pending'
-                    $timeout $scope.getCachedPlaylist(id, format), 5000
+                    # $timeout takes a callback function
+                    # https://stackoverflow.com/a/23391203/3225811
+                    $timeout(
+                        () ->$scope.getCachedPlaylist(id, format)
+                    , 5000)
                 else
                     $scope.isInProgress = false
                     $window.open $scope.playlistUrl
diff --git a/resources/assets/scripts/app/controllers/track.coffee b/resources/assets/scripts/app/controllers/track.coffee
index 97393695..b6112214 100644
--- a/resources/assets/scripts/app/controllers/track.coffee
+++ b/resources/assets/scripts/app/controllers/track.coffee
@@ -81,8 +81,12 @@ angular.module('ponyfm').controller "track", [
                 if $scope.trackUrl == 'error'
                     $scope.isInProgress = false
                 else if $scope.trackUrl == 'pending'
-                    $timeout $scope.getCachedTrack(id, format), 5000
+                    # $timeout takes a callback function
+                    # https://stackoverflow.com/a/23391203/3225811
+                    $timeout(
+                        ()-> $scope.getCachedTrack(id, format)
+                    , 5000)
                 else
                     $scope.isInProgress = false
-                    $window.location = $scope.trackUrl#, '_blank'
+                    $window.location = $scope.trackUrl
 ]

From 4214dde7b0eea5d89214fdc4e14a3f1cb11466b2 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 9 Nov 2015 22:40:09 -0800
Subject: [PATCH 44/44] #4: The file size updating method no longer overwrites
 file size estimates for un-cached files with null.

---
 app/Console/Commands/RebuildFilesizes.php |  7 +++++--
 app/TrackFile.php                         | 15 +++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Console/Commands/RebuildFilesizes.php b/app/Console/Commands/RebuildFilesizes.php
index 3d81a34a..8b0e99ae 100644
--- a/app/Console/Commands/RebuildFilesizes.php
+++ b/app/Console/Commands/RebuildFilesizes.php
@@ -20,6 +20,7 @@
 
 namespace Poniverse\Ponyfm\Console\Commands;
 
+use File;
 use Illuminate\Console\Command;
 use Poniverse\Ponyfm\TrackFile;
 
@@ -67,8 +68,10 @@ class RebuildFilesizes extends Command
                 $this->info('========== Start Chunk ==========');
 
                 foreach ($trackFiles as $trackFile) {
-                    $size = $trackFile->updateFilesize();
-                    if ($size !== null) {
+                    /** @var TrackFile $trackFile */
+
+                    if (File::exists($trackFile->getFile())) {
+                        $size = $trackFile->updateFilesize();
                         $this->info('ID ' . $trackFile->id . ' processed - ' . $size . ' bytes');
                     } else {
                         $this->info('ID ' . $trackFile->id . ' skipped');
diff --git a/app/TrackFile.php b/app/TrackFile.php
index 46c67190..63556f4e 100644
--- a/app/TrackFile.php
+++ b/app/TrackFile.php
@@ -126,19 +126,22 @@ class TrackFile extends Model
         return 'track_file-' . $this->id . '-' . $key;
     }
 
+    /**
+     * If this file exists, update its estimated filesize in the database.
+     *
+     * @return int $size
+     */
     public function updateFilesize()
     {
         $file = $this->getFile();
 
         if (File::exists($file)) {
             $size = File::size($file);
-        } else {
-            $size = null;
+
+            $this->filesize = $size;
+            $this->update();
         }
 
-        $this->filesize = $size;
-        $this->update();
-
-        return $size;
+        return $this->filesize;
     }
 }