Added package avoiding

hiqdev · Apr 24, 2017 · a0562a3 · a0562a3
1 parent 59e4260
commit a0562a3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/console/MaintenanceController.php b/src/console/MaintenanceController.php
@@ -67,7 +67,7 @@ public function actionSyncToDb()
      */
     public function actionUpdateExpired()
     {
-        $packages = $this->packageRepository->getExpired();
+        $packages = $this->packageRepository->getExpiredForUpdate();
 
         foreach ($packages as $package) {
             $package->load();

diff --git a/src/repositories/PackageRepository.php b/src/repositories/PackageRepository.php
@@ -55,10 +55,22 @@ public function update(AssetPackage $package)
     {
         return $this->db->createCommand()->update('package', [
             'last_update' => $package->getUpdateTime()
-        ], [
+        ], $this->getWhereCondition($package))->execute();
+    }
+
+    public function markAvoided(AssetPackage $package)
+    {
+        $this->db->createCommand()->update('package', [
+            'is_avoided' => true
+        ], $this->getWhereCondition($package))->execute();
+    }
+
+    protected function getWhereCondition(AssetPackage $package)
+    {
+        return [
             'type' => $package->getType(),
             'name' => $package->getName(),
-        ])->execute();
+        ];
     }
 
     /**
@@ -76,12 +88,13 @@ public function exists(AssetPackage $package)
     /**
      * @return \hiqdev\assetpackagist\models\AssetPackage[]
      */
-    public function getExpired()
+    public function getExpiredForUpdate()
     {
         $rows = (new Query())
             ->from('package')
             ->where(['<', 'last_update', time() - 60 * 60 * 24 * 7]) // Older than 7 days
             ->andWhere(['not', ['last_update' => null]])
+            ->andWhere(['is_avoided' => null])
             ->all();
 
         return $this->hydrate($rows);