nextcloud / server

apps/dav/lib/Migration/Version1006Date20180628111625.php

Indentation +70 added lines, -70 removed lines

@@ -31,78 +31,78 @@
 
 class Version1006Date20180628111625 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendarsubscrobjects')) {
-			$table = $schema->createTable('calendarsubscrobjects');
-			$table->addColumn('id', Type::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendardata', Type::BLOB, [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', Type::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('subscriptionid', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastmodified', Type::INTEGER, [
-				'notnull' => false,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', Type::STRING, [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('componenttype', Type::STRING, [
-				'notnull' => false,
-				'length' => 8,
-			]);
-			$table->addColumn('firstoccurence', Type::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastoccurence', Type::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', Type::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('classification', Type::INTEGER, [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['subscriptionid', 'uri'], 'subobjects_index');
-		}
+        if (!$schema->hasTable('calendarsubscrobjects')) {
+            $table = $schema->createTable('calendarsubscrobjects');
+            $table->addColumn('id', Type::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendardata', Type::BLOB, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', Type::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('subscriptionid', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastmodified', Type::INTEGER, [
+                'notnull' => false,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', Type::STRING, [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('componenttype', Type::STRING, [
+                'notnull' => false,
+                'length' => 8,
+            ]);
+            $table->addColumn('firstoccurence', Type::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastoccurence', Type::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', Type::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('classification', Type::INTEGER, [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['subscriptionid', 'uri'], 'subobjects_index');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }
 
 

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

Indentation +194 added lines, -194 removed lines

@@ -37,198 +37,198 @@
 
 class RefreshWebcalJob extends Job {
 
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var IClientService */
-	private $clientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var array */
-	private $subscription;
-
-	/**
-	 * RefreshWebcalJob constructor.
-	 *
-	 * @param CalDavBackend $calDavBackend
-	 * @param IClientService $clientService
-	 * @param ILogger $logger
-	 */
-	public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger, ITimeFactory $timeFactory) {
-		$this->calDavBackend = $calDavBackend;
-		$this->clientService = $clientService;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * this function is called at most every hour
-	 *
-	 * @inheritdoc
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$subscription = $this->getSubscription($this->argument['principaluri'], $this->argument['uri']);
-		if (!$subscription) {
-			return;
-		}
-
-		// if no refresh rate was configured, just refresh once a week
-		$subscriptionId = $subscription['id'];
-		$subscription['refreshrate'] = $subscription['refreshrate'] || 'P1W';
-
-		try {
-			/** @var \DateInterval $dateInterval */
-			$dateInterval = DateTimeParser::parseDuration($subscription['refreshrate']);
-		} catch(InvalidDataException $ex) {
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed, refreshrate in database is invalid");
-			return;
-		}
-
-		$interval = $this->getIntervalFromDateInterval($dateInterval);
-		if (($this->timeFactory->getTime() - $this->lastRun) <= $interval) {
-			return;
-		}
-
-		parent::execute($jobList, $logger);
-	}
-
-	/**
-	 * @param array $argument
-	 */
-	protected function run($argument) {
-		$subscription = $this->getSubscription($argument['principaluri'], $argument['uri']);
-		if (!$subscription) {
-			return;
-		}
-
-		$webcalData = $this->queryWebcalFeed($subscription);
-		if (!$webcalData) {
-			return;
-		}
-
-		$stripTodos = $subscription['striptodos'];
-		$stripAlarms = $subscription['stripalarms'];
-		$stripAttachments = $subscription['stripattachments'];
-
-		try {
-			$splitter = new ICalendar($webcalData);
-
-			// we wait with deleting all purged events till we parsed the new ones
-			// in case the new calendar is broken and new ICalendar throws a ParseException
-			// the user will still see the old data
-			$this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
-
-			while ($vObject = $splitter->getNext()) {
-				/** @var Component $vObject */
-				$uid = null;
-				$compName = null;
-
-				foreach ($vObject->getComponents() as $component) {
-					if ($component->name === 'VTIMEZONE') {
-						continue;
-					}
-
-					$uid = $component->{'UID'}->getValue();
-					$compName = $component->name;
-
-					if ($stripAlarms) {
-						unset($component->{'VALARM'});
-					}
-					if ($stripAttachments) {
-						unset($component->{'ATTACH'});
-					}
-				}
-
-				if ($stripTodos && $compName === 'VTODO') {
-					continue;
-				}
-
-				$uri = $uid . '.ics';
-				$calendarData = $vObject->serialize();
-				try {
-					$this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
-				} catch(BadRequest $ex) {
-					$this->logger->logException($ex);
-				}
-			}
-
-		} catch(ParseException $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
-		}
-	}
-
-	/**
-	 * @param array $subscription
-	 * @return null|resource
-	 */
-	private function queryWebcalFeed(array $subscription) {
-		$client = $this->clientService->newClient();
-		try {
-			$response = $client->get($subscription['source'], [
-				'stream' => true,
-				'allow_redirects' => [
-					'redirects' => 10
-				],
-			]);
-
-			return $response->getBody();
-		} catch(\Exception $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
-
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $uri
-	 * @return array|null
-	 */
-	private function getSubscription($principalUri, $uri) {
-		$arrIndex = $principalUri . '::' . $uri;
-		if (isset($this->subscription[$arrIndex])) {
-			return $this->subscription[$arrIndex];
-		}
-
-		$subscriptions = array_filter(
-			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function($sub) use ($uri) {
-				return $sub['uri'] === $uri;
-			}
-		);
-
-		if (\count($subscriptions) === 0) {
-			return null;
-		}
-
-		$this->subscription[$arrIndex] = $subscriptions[0];
-		return $this->subscription[$arrIndex];
-	}
-
-	/**
-	 * get total number of seconds from DateInterval object
-	 *
-	 * @param \DateInterval $interval
-	 * @return int
-	 */
-	private function getIntervalFromDateInterval(\DateInterval $interval):int {
-		return $interval->s
-			+ ($interval->i * 60)
-			+ ($interval->h * 60 * 60)
-			+ ($interval->d * 60 * 60 * 24)
-			+ ($interval->m * 60 * 60 * 24 * 30)
-			+ ($interval->y * 60 * 60 * 24 * 365);
-	}
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var IClientService */
+    private $clientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var array */
+    private $subscription;
+
+    /**
+     * RefreshWebcalJob constructor.
+     *
+     * @param CalDavBackend $calDavBackend
+     * @param IClientService $clientService
+     * @param ILogger $logger
+     */
+    public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger, ITimeFactory $timeFactory) {
+        $this->calDavBackend = $calDavBackend;
+        $this->clientService = $clientService;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * this function is called at most every hour
+     *
+     * @inheritdoc
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $subscription = $this->getSubscription($this->argument['principaluri'], $this->argument['uri']);
+        if (!$subscription) {
+            return;
+        }
+
+        // if no refresh rate was configured, just refresh once a week
+        $subscriptionId = $subscription['id'];
+        $subscription['refreshrate'] = $subscription['refreshrate'] || 'P1W';
+
+        try {
+            /** @var \DateInterval $dateInterval */
+            $dateInterval = DateTimeParser::parseDuration($subscription['refreshrate']);
+        } catch(InvalidDataException $ex) {
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed, refreshrate in database is invalid");
+            return;
+        }
+
+        $interval = $this->getIntervalFromDateInterval($dateInterval);
+        if (($this->timeFactory->getTime() - $this->lastRun) <= $interval) {
+            return;
+        }
+
+        parent::execute($jobList, $logger);
+    }
+
+    /**
+     * @param array $argument
+     */
+    protected function run($argument) {
+        $subscription = $this->getSubscription($argument['principaluri'], $argument['uri']);
+        if (!$subscription) {
+            return;
+        }
+
+        $webcalData = $this->queryWebcalFeed($subscription);
+        if (!$webcalData) {
+            return;
+        }
+
+        $stripTodos = $subscription['striptodos'];
+        $stripAlarms = $subscription['stripalarms'];
+        $stripAttachments = $subscription['stripattachments'];
+
+        try {
+            $splitter = new ICalendar($webcalData);
+
+            // we wait with deleting all purged events till we parsed the new ones
+            // in case the new calendar is broken and new ICalendar throws a ParseException
+            // the user will still see the old data
+            $this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
+
+            while ($vObject = $splitter->getNext()) {
+                /** @var Component $vObject */
+                $uid = null;
+                $compName = null;
+
+                foreach ($vObject->getComponents() as $component) {
+                    if ($component->name === 'VTIMEZONE') {
+                        continue;
+                    }
+
+                    $uid = $component->{'UID'}->getValue();
+                    $compName = $component->name;
+
+                    if ($stripAlarms) {
+                        unset($component->{'VALARM'});
+                    }
+                    if ($stripAttachments) {
+                        unset($component->{'ATTACH'});
+                    }
+                }
+
+                if ($stripTodos && $compName === 'VTODO') {
+                    continue;
+                }
+
+                $uri = $uid . '.ics';
+                $calendarData = $vObject->serialize();
+                try {
+                    $this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
+                } catch(BadRequest $ex) {
+                    $this->logger->logException($ex);
+                }
+            }
+
+        } catch(ParseException $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
+        }
+    }
+
+    /**
+     * @param array $subscription
+     * @return null|resource
+     */
+    private function queryWebcalFeed(array $subscription) {
+        $client = $this->clientService->newClient();
+        try {
+            $response = $client->get($subscription['source'], [
+                'stream' => true,
+                'allow_redirects' => [
+                    'redirects' => 10
+                ],
+            ]);
+
+            return $response->getBody();
+        } catch(\Exception $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
+
+            return null;
+        }
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $uri
+     * @return array|null
+     */
+    private function getSubscription($principalUri, $uri) {
+        $arrIndex = $principalUri . '::' . $uri;
+        if (isset($this->subscription[$arrIndex])) {
+            return $this->subscription[$arrIndex];
+        }
+
+        $subscriptions = array_filter(
+            $this->calDavBackend->getSubscriptionsForUser($principalUri),
+            function($sub) use ($uri) {
+                return $sub['uri'] === $uri;
+            }
+        );
+
+        if (\count($subscriptions) === 0) {
+            return null;
+        }
+
+        $this->subscription[$arrIndex] = $subscriptions[0];
+        return $this->subscription[$arrIndex];
+    }
+
+    /**
+     * get total number of seconds from DateInterval object
+     *
+     * @param \DateInterval $interval
+     * @return int
+     */
+    private function getIntervalFromDateInterval(\DateInterval $interval):int {
+        return $interval->s
+            + ($interval->i * 60)
+            + ($interval->h * 60 * 60)
+            + ($interval->d * 60 * 60 * 24)
+            + ($interval->m * 60 * 60 * 24 * 30)
+            + ($interval->y * 60 * 60 * 24 * 365);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -84,7 +84,7 @@ 
 		try {
 			/** @var \DateInterval $dateInterval */
 			$dateInterval = DateTimeParser::parseDuration($subscription['refreshrate']);
-		} catch(InvalidDataException $ex) {
+		} catch (InvalidDataException $ex) {
 			$this->logger->logException($ex);
 			$this->logger->warning("Subscription $subscriptionId could not be refreshed, refreshrate in database is invalid");
 			return;
@@ -149,16 +149,16 @@ 
 					continue;
 				}
 
-				$uri = $uid . '.ics';
+				$uri = $uid.'.ics';
 				$calendarData = $vObject->serialize();
 				try {
 					$this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
-				} catch(BadRequest $ex) {
+				} catch (BadRequest $ex) {
 					$this->logger->logException($ex);
 				}
 			}
 
-		} catch(ParseException $ex) {
+		} catch (ParseException $ex) {
 			$subscriptionId = $subscription['id'];
 
 			$this->logger->logException($ex);
@@ -181,7 +181,7 @@ 
 			]);
 
 			return $response->getBody();
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 			$subscriptionId = $subscription['id'];
 
 			$this->logger->logException($ex);
@@ -197,7 +197,7 @@ 
 	 * @return array|null
 	 */
 	private function getSubscription($principalUri, $uri) {
-		$arrIndex = $principalUri . '::' . $uri;
+		$arrIndex = $principalUri.'::'.$uri;
 		if (isset($this->subscription[$arrIndex])) {
 			return $this->subscription[$arrIndex];
 		}