From fc5935328326469a957c5d70bdd6c4db8233e7af Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 18 Jan 2017 13:41:40 +0200
Subject: [PATCH] Ntr

---
 common/modules/product/models/Import.php | 14 ++++++++++++--
 console/controllers/ImportController.php | 15 +--------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/common/modules/product/models/Import.php b/common/modules/product/models/Import.php
index b95eaec..fbc4e7f 100755
--- a/common/modules/product/models/Import.php
+++ b/common/modules/product/models/Import.php
@@ -60,6 +60,11 @@ class Import extends Model {
     public function goPrices($from = 0, $limit = null) {
         set_time_limit(0);
         $new_products = $linked_products = 0;
+        if (file_exists(Yii::getAlias('@uploadDir/goPrices.lock'))) {
+            return 'Task already executed';
+        }
+        $ff = fopen(Yii::getAlias('@uploadDir/goPrices.lock'), 'w+');
+        fclose($ff);
 
         if ( !($handle = $this->getProductsFile('uploadFilePrices')) ) {
             $this->errors[] = 'File not found';
@@ -208,7 +213,7 @@ class Import extends Model {
         if ($result['end']) {
             unlink(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'));
         }
-
+        unlink(Yii::getAlias('@uploadDir/goPrices.lock'));
         return $result;
     }
 
@@ -216,6 +221,11 @@ class Import extends Model {
 
         set_time_limit(0);
         $new_products = $linked_products = 0;
+        if (file_exists(Yii::getAlias('@uploadDir/goProducts.lock'))) {
+            return 'Task already executed';
+        }
+        $ff = fopen(Yii::getAlias('@uploadDir/goProducts.lock'), 'w+');
+        fclose($ff);
 
         if ( !($handle = $this->getProductsFile('uploadFileProducts')) ) {
             $this->errors[] = 'File not found';
@@ -506,7 +516,7 @@ class Import extends Model {
         if ($result['end']) {
             unlink(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts'));
         }
-
+        unlink(Yii::getAlias('@uploadDir/goProducts.lock'));
         return $result;
     }
 
diff --git a/console/controllers/ImportController.php b/console/controllers/ImportController.php
index e7abad1..4c109fa 100755
--- a/console/controllers/ImportController.php
+++ b/console/controllers/ImportController.php
@@ -50,28 +50,15 @@ class ImportController extends Controller {
     }
 
     public function actionProducts() {
-        if (file_exists(Yii::getAlias('@uploadDir/goProducts.lock'))) {
-            $this->errors[] = 'Task already executed';
-            return Controller::EXIT_CODE_ERROR;
-        }
-        $ff = fopen(Yii::getAlias('@uploadDir/goProducts.lock'), 'w+');
-        fclose($ff);
         $model = new Import();
         $model->goProducts(0, null);
-        unlink(Yii::getAlias('@uploadDir/goProducts.lock'));
         return Controller::EXIT_CODE_NORMAL;
     }
 
     public function actionPrices() {
-        if (file_exists(Yii::getAlias('@uploadDir/goPrices.lock'))) {
-            $this->stderr('Task already executed');
-            return Controller::EXIT_CODE_ERROR;
-        }
-        $ff = fopen(Yii::getAlias('@uploadDir/goPrices.lock'), 'w+');
-        fclose($ff);
+
         $model = new Import();
         $data = $model->goPrices(0, null);
-        unlink(Yii::getAlias('@uploadDir/goPrices.lock'));
         return Controller::EXIT_CODE_NORMAL;
     }
 
--
libgit2 0.21.4