Jalle19 / tvheadend-status-manager

src/cli/Configuration.php

Braces +6 added lines, -4 removed lines

@@ -92,8 +92,9 @@ 
 	 */
 	public function setUpdateInterval($updateInterval)
 	{
-		if ($updateInterval <= 0)
-			throw new \RuntimeException('Invalid update interval specified');
+		if ($updateInterval <= 0) {
+					throw new \RuntimeException('Invalid update interval specified');
+		}
 
 		$this->_updateInterval = $updateInterval;
 	}
@@ -133,8 +134,9 @@ 
 	 */
 	public function setListenPort($listenPort)
 	{
-		if ($listenPort < 1 || $listenPort > 65535)
-			throw new \RuntimeException('Invalid port specified');
+		if ($listenPort < 1 || $listenPort > 65535) {
+					throw new \RuntimeException('Invalid port specified');
+		}
 
 		$this->_listenPort = $listenPort;
 	}

src/cli/Console/Commands/TvheadendStatusManagerCommand.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 		if ($configuration === false)
 			throw new InvalidConfigurationException('Failed to parse the specified configuration file');
 
-		$instances    = [];
+		$instances = [];
 
 		// Parse sections
 		foreach ($configuration as $section => $values)

Braces +23 added lines, -16 removed lines

@@ -124,23 +124,26 @@ 
 	private function parseConfiguration(InputInterface $input)
 	{
 		// Check that the configuration file exists
-		if (!file_exists($input->getArgument('configFile')))
-			throw new InvalidConfigurationException('The specified configuration file does not exist');
+		if (!file_exists($input->getArgument('configFile'))) {
+					throw new InvalidConfigurationException('The specified configuration file does not exist');
+		}
 
 		// Check that the database exists and is writable
 		$databasePath = $input->getArgument('databaseFile');
 
-		if (!file_exists($databasePath))
-			throw new InvalidConfigurationException('The specified database path does not exist');
-		else if (!is_writable($databasePath))
-			throw new InvalidConfigurationException('The specified database path is not writable');
+		if (!file_exists($databasePath)) {
+					throw new InvalidConfigurationException('The specified database path does not exist');
+		} else if (!is_writable($databasePath)) {
+					throw new InvalidConfigurationException('The specified database path is not writable');
+		}
 
 		// Parse the configuration file
 		$configuration = parse_ini_file($input->getArgument('configFile'), true);
 
 		// Check that the file was parsed
-		if ($configuration === false)
-			throw new InvalidConfigurationException('Failed to parse the specified configuration file');
+		if ($configuration === false) {
+					throw new InvalidConfigurationException('Failed to parse the specified configuration file');
+		}
 
 		$instances    = [];
 
@@ -157,12 +160,14 @@ 
 					$instance = new Instance($name, $address, $port);
 
 					// Optionally set ignored users
-					if (isset($values['ignoredUsers']))
-						$instance->setIgnoredUsers($values['ignoredUsers']);
+					if (isset($values['ignoredUsers'])) {
+											$instance->setIgnoredUsers($values['ignoredUsers']);
+					}
 
 					// Optionally set credentials
-					if (isset($values['username']) && isset($values['password']))
-						$instance->setCredentials($values['username'], $values['password']);
+					if (isset($values['username']) && isset($values['password'])) {
+											$instance->setCredentials($values['username'], $values['password']);
+					}
 
 					$instances[] = $instance;
 					break;
@@ -170,8 +175,9 @@ 
 		}
 
 		// Validate the configuration. We need at least one instance.
-		if (empty($instances))
-			throw new InvalidConfigurationException('No instances defined, you need to specify at least one instance');
+		if (empty($instances)) {
+					throw new InvalidConfigurationException('No instances defined, you need to specify at least one instance');
+		}
 
 		// Create the configuration object
 		$config = new Configuration($databasePath, $instances);
@@ -200,8 +206,9 @@ 
 	 */
 	private static function getSectionType($section)
 	{
-		if (substr($section, 0, 8) === 'instance')
-			return Configuration::SECTION_TYPE_INSTANCE;
+		if (substr($section, 0, 8) === 'instance') {
+					return Configuration::SECTION_TYPE_INSTANCE;
+		}
 
 		throw new InvalidConfigurationException('Unknown section "' . $section . '"');
 	}

src/cli/PersistenceManager.php

Braces +21 added lines, -14 removed lines

@@ -50,8 +50,9 @@ 
 	 */
 	public function onInstanceSeen(Tvheadend $instance)
 	{
-		if ($this->hasInstance($instance))
-			return;
+		if ($this->hasInstance($instance)) {
+					return;
+		}
 
 		$instanceModel = new Database\Instance();
 		$instanceModel->setPrimaryKey($instance->getHostname());
@@ -80,8 +81,9 @@ 
 	 */
 	public function onConnectionSeen($instanceName, ConnectionStatus $connectionStatus)
 	{
-		if ($this->hasConnection($instanceName, $connectionStatus))
-			return;
+		if ($this->hasConnection($instanceName, $connectionStatus)) {
+					return;
+		}
 
 		$user = null;
 
@@ -114,8 +116,9 @@ 
 	 */
 	public function onUserSeen($instanceName, $userName)
 	{
-		if ($this->hasUser($instanceName, $userName))
-			return;
+		if ($this->hasUser($instanceName, $userName)) {
+					return;
+		}
 
 		$user = new User();
 		$user->setInstanceName($instanceName)->setName($userName);
@@ -136,8 +139,9 @@ 
 	 */
 	public function onChannelSeen($instanceName, $channelName)
 	{
-		if ($this->hasChannel($instanceName, $channelName))
-			return;
+		if ($this->hasChannel($instanceName, $channelName)) {
+					return;
+		}
 
 		$channel = new Channel();
 		$channel->setInstanceName($instanceName)->setName($channelName);
@@ -159,8 +163,9 @@ 
 	public function onSubscriptionSeen($instanceName, SubscriptionStatus $status)
 	{
 		// Ignore EPG grabber subscriptions
-		if ($status->getType() === SubscriptionStatus::TYPE_EPGGRAB)
-			return;
+		if ($status->getType() === SubscriptionStatus::TYPE_EPGGRAB) {
+					return;
+		}
 
 		// Determine the username to store for the subscription
 		$username = $status->username;
@@ -180,8 +185,9 @@ 
 		$this->onChannelSeen($instanceName, $status->channel);
 		$channel = ChannelQuery::create()->filterByInstance($instance)->filterByName($status->channel)->findOne();
 
-		if ($this->hasSubscription($instance, $user, $channel, $status))
-			return;
+		if ($this->hasSubscription($instance, $user, $channel, $status)) {
+					return;
+		}
 
 		$subscription = new Subscription();
 		$subscription->setInstance($instance)->setUser($user)->setChannel($channel)
@@ -205,8 +211,9 @@ 
 	public function onSubscriptionStateChange($instanceName, StateChange $stateChange)
 	{
 		// We only need to persist subscription stops
-		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED)
-			return;
+		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED) {
+					return;
+		}
 
 		// Find the latest matching subscription
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)

Doc Comments +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 
 
 	/**
-	 * @param                  $instanceName
+	 * @param                  string $instanceName
 	 * @param ConnectionStatus $connectionStatus
 	 *
 	 * @return bool whether the connection exists in the database

Indentation +17 added lines, -17 removed lines

@@ -94,13 +94,13 @@ 
 			$this->onUserSeen($instanceName, $connectionStatus->user);
 
 			$user = UserQuery::create()->filterByInstanceName($instanceName)->filterByName($connectionStatus->user)
-			                 ->findOne();
+							 ->findOne();
 		}
 
 		$connection = new Connection();
 		$connection->setInstanceName($instanceName)->setPeer($connectionStatus->peer)
-		           ->setUser($user)
-		           ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
+				   ->setUser($user)
+				   ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
 
 		$this->_logger->info('Stored new connection (instance: {instanceName}, peer: {peer})', [
 			'instanceName' => $instanceName,
@@ -127,11 +127,11 @@ 
 		$input = new Input();
 		$input->setPrimaryKey($inputStatus->uuid);
 		$input->setInstanceName($instanceName)
-		      ->setStarted(new \DateTime())
-		      ->setInput($inputStatus->input)
-		      ->setWeight($inputStatus->weight)
-		      ->setNetwork(Input::parseNetwork($inputStatus))
-		      ->setMux(Input::parseMux($inputStatus))->save();
+			  ->setStarted(new \DateTime())
+			  ->setInput($inputStatus->input)
+			  ->setWeight($inputStatus->weight)
+			  ->setNetwork(Input::parseNetwork($inputStatus))
+			  ->setMux(Input::parseMux($inputStatus))->save();
 
 		$this->_logger->info('Stored new input (instance: {instanceName}, network: {network}, mux: {mux}, weight: {weight})',
 			[
@@ -237,8 +237,8 @@ 
 
 		$subscription = new Subscription();
 		$subscription->setInstance($instance)->setInput($input)->setUser($user)->setChannel($channel)
-		             ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
-		             ->setService($status->service);
+					 ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
+					 ->setService($status->service);
 		$subscription->save();
 
 		$this->_logger->info('Stored new subscription (instance: {instanceName}, user: {userName}, channel: {channelName})',
@@ -262,8 +262,8 @@ 
 
 		// Find the latest matching subscription
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)
-		                                 ->filterBySubscriptionId($stateChange->getSubscriptionId())
-		                                 ->addDescendingOrderByColumn('started')->findOne();
+										 ->filterBySubscriptionId($stateChange->getSubscriptionId())
+										 ->addDescendingOrderByColumn('started')->findOne();
 
 		// EPG grab subscriptions are not stored so we don't want to log these with a high level
 		if ($subscription === null)
@@ -312,7 +312,7 @@ 
 	private function hasConnection($instanceName, ConnectionStatus $connectionStatus)
 	{
 		return ConnectionQuery::create()->filterByInstanceName($instanceName)->filterByPeer($connectionStatus->peer)
-		                      ->filterByStarted($connectionStatus->started)->findOne() !== null;
+							  ->filterByStarted($connectionStatus->started)->findOne() !== null;
 	}
 
 
@@ -348,7 +348,7 @@ 
 	private function hasChannel($instanceName, $channelName)
 	{
 		return ChannelQuery::create()->filterByInstanceName($instanceName)->filterByName($channelName)
-		                   ->findOne() !== null;
+						   ->findOne() !== null;
 	}
 
 
@@ -371,9 +371,9 @@ 
 		$userId = $user !== null ? $user->getId() : null;
 
 		return SubscriptionQuery::create()->filterByInstance($instance)->filterByUserId($userId)
-		                        ->filterByChannel($channel)
-		                        ->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
-		                        ->findOne() !== null;
+								->filterByChannel($channel)
+								->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
+								->findOne() !== null;
 	}
 
 }

src/cli/Subscription/StateChangeParser.php

Braces +8 added lines, -6 removed lines

@@ -29,8 +29,9 @@ 
 		{
 			$stateChange = self::parseMessage($logMessage->logtxt);
 
-			if ($stateChange !== null)
-				$stateChanges[] = $stateChange;
+			if ($stateChange !== null) {
+							$stateChanges[] = $stateChange;
+			}
 		}
 
 		return $stateChanges;
@@ -54,10 +55,11 @@ 
 			$stateChange = new StateChange(self::getSubscriptionId($messageParts[3]));
 
 			// Check the state
-			if (strpos($message, 'subscribing on channel') !== false)
-				$stateChange->setState(StateChange::STATE_SUBSCRIPTION_STARTED);
-			else if (strpos($message, 'unsubscribing from'))
-				$stateChange->setState(StateChange::STATE_SUBSCRIPTION_STOPPED);
+			if (strpos($message, 'subscribing on channel') !== false) {
+							$stateChange->setState(StateChange::STATE_SUBSCRIPTION_STARTED);
+			} else if (strpos($message, 'unsubscribing from')) {
+							$stateChange->setState(StateChange::STATE_SUBSCRIPTION_STOPPED);
+			}
 
 			return $stateChange;
 		}

src/cli/Database/InputQuery.php

Indentation +3 added lines, -3 removed lines

@@ -27,9 +27,9 @@
 	public function filterBySubscriptionStatus($instanceName, SubscriptionStatus $status)
 	{
 		return $this->filterByInstanceName($instanceName)
-		            ->filterByNetwork(Subscription::parseNetwork($status))
-		            ->filterByMux(Subscription::parseMux($status))
-		            ->addDescendingOrderByColumn('started');
+					->filterByNetwork(Subscription::parseNetwork($status))
+					->filterByMux(Subscription::parseMux($status))
+					->addDescendingOrderByColumn('started');
 	}
 
 }

src/cli/StatusManager.php

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 				$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
 
 			// Persist inputs
-			foreach($instanceStatus->getInputs() as $input)
+			foreach ($instanceStatus->getInputs() as $input)
 				$this->_persistenceManager->onInputSeen($instanceName, $input);
 
 			// Persist running subscriptions

Braces +19 added lines, -16 removed lines

@@ -70,8 +70,9 @@ 
 		$this->_instances        = new \SplObjectStorage();
 
 		// Attach a state to each instance
-		foreach ($this->_configuration->getInstances() as $instance)
-			$this->_instances->attach($instance, new InstanceState());
+		foreach ($this->_configuration->getInstances() as $instance) {
+					$this->_instances->attach($instance, new InstanceState());
+		}
 
 		// Start the persistence manager
 		$this->_persistenceManager = new PersistenceManager($logger);
@@ -147,20 +148,24 @@ 
 			]);
 
 			// Persist connections
-			foreach ($instanceStatus->getConnections() as $connection)
-				$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			foreach ($instanceStatus->getConnections() as $connection) {
+							$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			}
 
 			// Persist inputs
-			foreach($instanceStatus->getInputs() as $input)
-				$this->_persistenceManager->onInputSeen($instanceName, $input);
+			foreach($instanceStatus->getInputs() as $input) {
+							$this->_persistenceManager->onInputSeen($instanceName, $input);
+			}
 
 			// Persist running subscriptions
-			foreach ($instanceStatus->getSubscriptions() as $subscription)
-				$this->_persistenceManager->onSubscriptionSeen($instanceName, $subscription);
+			foreach ($instanceStatus->getSubscriptions() as $subscription) {
+							$this->_persistenceManager->onSubscriptionSeen($instanceName, $subscription);
+			}
 
 			// Handle subscription state changes
-			foreach ($instanceStatus->getSubscriptionStateChanges() as $subscriptionStateChange)
-				$this->_persistenceManager->onSubscriptionStateChange($instanceName, $subscriptionStateChange);
+			foreach ($instanceStatus->getSubscriptionStateChanges() as $subscriptionStateChange) {
+							$this->_persistenceManager->onSubscriptionStateChange($instanceName, $subscriptionStateChange);
+			}
 		}
 
 		// Broadcast the status messages to all connected clients
@@ -208,8 +213,7 @@ 
 
 						$instanceState->setReachability(InstanceState::REACHABLE);
 					}
-				}
-				catch (\Exception $e)
+				} catch (\Exception $e)
 				{
 					// Mark the instance as unreachable
 					$message = 'Instance {instanceName} not reachable, will wait for {cycles} cycles before retrying.
@@ -223,8 +227,7 @@ 
 
 					$instanceState->setReachability(InstanceState::UNREACHABLE);
 				}
-			}
-			else
+			} else
 			{
 				// Wait for some cycles and then mark unreachable instances as maybe reachable
 				if ($instanceState->getRetryCount() === self::UNREACHABLE_CYCLES_UNTIL_RETRY - 1)
@@ -235,9 +238,9 @@ 
 					$this->_logger->info('Retrying instance {instanceName} during next cycle', [
 						'instanceName' => $instanceName,
 					]);
+				} else {
+									$instanceState->incrementRetryCount();
 				}
-				else
-					$instanceState->incrementRetryCount();
 			}
 		}