PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-29 08:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Made the image re-importer more robust + fixed a typo.

Browse source
This commit is contained in:
Peter Deltchev 2016-03-16 09:32:39 -07:00
parent dab9f08cf5
commit af760aa13f
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Models/Image.php
View file

@ -83,10 +83,7 @@ class Image extends Model
$hash = md5_file($file->getPathname()); $hash = md5_file($file->getPathname());
$image = Image::whereHash($hash)->whereUploadedBy($userId)->first(); $image = Image::whereHash($hash)->whereUploadedBy($userId)->first();
if (!$forceReupload && $image) { if ($image) {
return $image;
}
if ($forceReupload) { if ($forceReupload) {
// delete existing versions of the image // delete existing versions of the image
$filenames = scandir($image->getDirectory()); $filenames = scandir($image->getDirectory());
@ -99,7 +96,9 @@ class Image extends Model
foreach($filenames as $filename) { foreach($filenames as $filename) {
unlink($image->getDirectory().'/'.$filename); unlink($image->getDirectory().'/'.$filename);
} }
} else {
return $image;
}
} else { } else {
$image = new Image(); $image = new Image();
} }

2
resources/assets/scripts/app/app.coffee
View file

@ -346,7 +346,7 @@ ponyfm.config [
templateUrl: '/templates/home/index.html' templateUrl: '/templates/home/index.html'
controller: 'home' controller: 'home'
# Final catch-all for aritsts # Final catch-all for artists
state.state 'content.artist', state.state 'content.artist',
url: '^/{slug}' url: '^/{slug}'
templateUrl: '/templates/artists/_show_layout.html' templateUrl: '/templates/artists/_show_layout.html'