partkeepr

fork of partkeepr
git clone https://git.e1e0.net/partkeepr.git
Log | Files | Refs | Submodules | README | LICENSE

commit 04b5f10fdc576ef78e76c520ab32d77206f4d50f
parent 931d4c784b7cfdfd6184ed4406cbdef54000a111
Author: Felicitus <felicitus@felicitus.org>
Date:   Sat, 28 Nov 2015 16:00:55 +0100

Check existing directory prior attempting to move files

Diffstat:
Msrc/PartKeepr/SetupBundle/Controller/FileMigrationController.php | 12++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php b/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php @@ -65,8 +65,10 @@ class FileMigrationController extends SetupController $legacyMovePath = $legacyFilePath."/".$legacyFileDirectory."/"; $newMovePath = $legacyFilePath."/files/".$legacyFileDirectory."/"; - $this->moveFiles($legacyMovePath, $newMovePath); - $response["message"] = "Old image directories moved"; + if (is_dir($legacyMovePath)) { + $this->moveFiles($legacyMovePath, $newMovePath); + $response["message"] = "Old image directories moved"; + } } $legacyImageDirectories = array("footprint", "iclogo", "part", "storagelocation"); @@ -75,8 +77,10 @@ class FileMigrationController extends SetupController $legacyMovePath = $legacyImagePath."/".$legacyImageDirectory."/"; $newMovePath = $legacyFilePath."/images/".$legacyImageDirectory."/"; - $this->moveFiles($legacyMovePath, $newMovePath); - $response["message"] = "Old image directories moved"; + if (is_dir($legacyMovePath)) { + $this->moveFiles($legacyMovePath, $newMovePath); + $response["message"] = "Old image directories moved"; + } } return new JsonResponse($response);