/drupal7/sites/all/modules/feeds/includes/FeedsSource.inc - Diff - Club Drupal - Forge Centrale Marseille

Révision 41cc1b08

Ajouté par Assos Assos il y a presque 9 ans

ID 41cc1b088916e74b14a8306c1ea5576960872802
Parent 2b468206
Enfant 7707c013

Update feeds 7.x-2.0-alpha9 -> 7.x-2.0-beta1

Install lib simplepie 1.3.1

     define('FEEDS_PARSE', 'parse');
     define('FEEDS_PROCESS', 'process');
     define('FEEDS_PROCESS_CLEAR', 'process_clear');
     define('FEEDS_PROCESS_EXPIRE', 'process_expire');
     /**
      * Declares an interface for a class that defines default values and form
-...
       public $created;
       public $updated;
       public $deleted;
       public $unpublished;
       public $blocked;
       public $skipped;
       public $failed;
       /**
        * IDs of entities to be removed.
        */
       public $removeList;
       /**
        * Constructor, initialize variables.
        */
-...
         $this->created =
         $this->updated =
         $this->deleted =
         $this->unpublished =
         $this->blocked =
         $this->skipped =
         $this->failed = 0;
+      }
-...
       // Timestamp when this source was imported the last time.
       protected $imported;
       // Holds an exception object in case an exception occurs during importing.
       protected $exception;
       /**
        * Instantiate a unique object per class/id/feed_nid. Don't use
        * directly, use feeds_source() instead.
-...
        *   method may throw the same exceptions as FeedsSource::import().
        */
       public function startImport() {
         module_invoke_all('feeds_before_import', $this);
         $config = $this->importer->getConfig();
         if ($config['process_in_background']) {
           $this->startBackgroundJob('import');
-...
        */
       public function schedule() {
         $this->scheduleImport();
         $this->scheduleExpire();
+      }
       /**
-...
         if (is_numeric($fetcher_period)) {
           $period = $fetcher_period;
+        }
         $period = $this->progressImporting() === FEEDS_BATCH_COMPLETE ? $period : 0;
         $job = array(
           'type' => $this->id,
           'id' => $this->feed_nid,
           // Schedule as soon as possible if a batch is active.
           'period' => $period,
           'periodic' => TRUE,
         );
         if ($period != FEEDS_SCHEDULE_NEVER) {
         if ($period == FEEDS_SCHEDULE_NEVER && $this->progressImporting() === FEEDS_BATCH_COMPLETE) {
           JobScheduler::get('feeds_source_import')->remove($job);
+        }
         elseif ($this->progressImporting() === FEEDS_BATCH_COMPLETE) {
           JobScheduler::get('feeds_source_import')->set($job);
+        }
         else {
           JobScheduler::get('feeds_source_import')->remove($job);
           // Feed is not fully imported yet, so we put this job back in the queue
           // immediately for further processing.
           $queue = DrupalQueue::get('feeds_source_import');
           $queue->createItem($job);
+        }
+      }
       /**
        * Schedule background expire tasks.
        */
       public function scheduleExpire() {
         // Schedule as soon as possible if a batch is active.
         $period = $this->progressExpiring() === FEEDS_BATCH_COMPLETE ? 3600 : 0;
         $job = array(
           'type' => $this->id,
           'id' => $this->feed_nid,
           'period' => $period,
           'periodic' => TRUE,
         );
         if ($this->importer->processor->expiryTime() == FEEDS_EXPIRE_NEVER) {
           JobScheduler::get('feeds_source_expire')->remove($job);
+        }
         else {
           JobScheduler::get('feeds_source_expire')->set($job);
+        }
+      }
-...
         try {
           // If fetcher result is empty, we are starting a new import, log.
           if (empty($this->fetcher_result)) {
             module_invoke_all('feeds_before_import', $this);
             $this->state[FEEDS_START] = time();
+          }
-...
           // Process.
           $this->importer->processor->process($this, $parser_result);
           // Import finished without exceptions, so unset any potentially previously
           // recorded exceptions.
           unset($this->exception);
+        }
         catch (Exception $e) {
           // Do nothing.
           // $e is stored and re-thrown once we've had a chance to log our progress.
           // Set the exception so that other modules can check if an exception
           // occurred in hook_feeds_after_import().
           $this->exception = $e;
+        }
         $this->releaseLock();
-...
           $this->importer->processor->clear($this);
+        }
         catch (Exception $e) {
           // Do nothing.
           // $e is stored and re-thrown once we've had a chance to log our progress.
+        }
         $this->releaseLock();
-...
         return $result;
+      }
       /**
        * Removes all expired items from a feed.
        */
       public function expire() {
         $this->acquireLock();
         try {
           $result = $this->importer->processor->expire($this);
+        }
         catch (Exception $e) {
           // Will throw after the lock is released.
+        }
         $this->releaseLock();
         if (isset($e)) {
           throw $e;
+        }
         return $result;
+      }
       /**
        * Report progress as float between 0 and 1. 1 = FEEDS_BATCH_COMPLETE.
        */
-...
         return $this->state(FEEDS_PROCESS_CLEAR)->progress;
+      }
       /**
        * Report progress on expiry.
        */
       public function progressExpiring() {
         return $this->state(FEEDS_PROCESS_EXPIRE)->progress;
+      }
       /**
        * Return a state object for a given stage. Lazy instantiates new states.
+       *
-...
           'id' => $this->feed_nid,
         );
         JobScheduler::get('feeds_source_import')->remove($job);
         JobScheduler::get('feeds_source_expire')->remove($job);
+      }
       /**
-...
       protected function releaseLock() {
         lock_release("feeds_source_{$this->id}_{$this->feed_nid}");
+      }
       /**
        * Implements FeedsConfigurable::dependencies().
        */
       public function dependencies() {
         $dependencies = parent::dependencies();
         return array_merge($dependencies, $this->importer()->dependencies());
+      }
+    }

Formats disponibles : Unified diff

Projet

Général

Profil

Club Drupal

Révision 41cc1b08

Ajouté par Assos Assos il y a presque 9 ans