nextcloud / server

lib/private/App/AppStore/Fetcher/AppFetcher.php

Indentation +96 added lines, -96 removed lines

@@ -29,108 +29,108 @@
 use OCP\ILogger;
 
 class AppFetcher extends Fetcher {
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger
-		);
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger
+        );
 
-		$this->fileName = 'apps.json';
-		$this->setEndpoint();
-	}
+        $this->fileName = 'apps.json';
+        $this->setEndpoint();
+    }
 
-	/**
-	 * Only returns the latest compatible app release in the releases array
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		/** @var mixed[] $response */
-		$response = parent::fetch($ETag, $content);
+    /**
+     * Only returns the latest compatible app release in the releases array
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        /** @var mixed[] $response */
+        $response = parent::fetch($ETag, $content);
 
-		$ncVersion = $this->getVersion();
-		$ncMajorVersion = explode('.', $ncVersion)[0];
-		foreach($response['data'] as $dataKey => $app) {
-			$releases = [];
+        $ncVersion = $this->getVersion();
+        $ncMajorVersion = explode('.', $ncVersion)[0];
+        foreach($response['data'] as $dataKey => $app) {
+            $releases = [];
 
-			// Filter all compatible releases
-			foreach($app['releases'] as $release) {
-				// Exclude all nightly and pre-releases
-				if($release['isNightly'] === false
-					&& strpos($release['version'], '-') === false) {
-					// Exclude all versions not compatible with the current version
-					$versionParser = new VersionParser();
-					$version = $versionParser->getVersion($release['rawPlatformVersionSpec']);
-					if (
-						// Major version is bigger or equals to the minimum version of the app
-						version_compare($ncMajorVersion, $version->getMinimumVersion(), '>=')
-						// Major version is smaller or equals to the maximum version of the app
-						&& version_compare($ncMajorVersion, $version->getMaximumVersion(), '<=')
-					) {
-						$releases[] = $release;
-					}
-				}
-			}
+            // Filter all compatible releases
+            foreach($app['releases'] as $release) {
+                // Exclude all nightly and pre-releases
+                if($release['isNightly'] === false
+                    && strpos($release['version'], '-') === false) {
+                    // Exclude all versions not compatible with the current version
+                    $versionParser = new VersionParser();
+                    $version = $versionParser->getVersion($release['rawPlatformVersionSpec']);
+                    if (
+                        // Major version is bigger or equals to the minimum version of the app
+                        version_compare($ncMajorVersion, $version->getMinimumVersion(), '>=')
+                        // Major version is smaller or equals to the maximum version of the app
+                        && version_compare($ncMajorVersion, $version->getMaximumVersion(), '<=')
+                    ) {
+                        $releases[] = $release;
+                    }
+                }
+            }
 
-			// Get the highest version
-			$versions = [];
-			foreach($releases as $release) {
-				$versions[] = $release['version'];
-			}
-			usort($versions, 'version_compare');
-			$versions = array_reverse($versions);
-			$compatible = false;
-			if(isset($versions[0])) {
-				$highestVersion = $versions[0];
-				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
-						$compatible = true;
-						$response['data'][$dataKey]['releases'] = [$release];
-						break;
-					}
-				}
-			}
-			if(!$compatible) {
-				unset($response['data'][$dataKey]);
-			}
-		}
+            // Get the highest version
+            $versions = [];
+            foreach($releases as $release) {
+                $versions[] = $release['version'];
+            }
+            usort($versions, 'version_compare');
+            $versions = array_reverse($versions);
+            $compatible = false;
+            if(isset($versions[0])) {
+                $highestVersion = $versions[0];
+                foreach ($releases as $release) {
+                    if ((string)$release['version'] === (string)$highestVersion) {
+                        $compatible = true;
+                        $response['data'][$dataKey]['releases'] = [$release];
+                        break;
+                    }
+                }
+            }
+            if(!$compatible) {
+                unset($response['data'][$dataKey]);
+            }
+        }
 
-		$response['data'] = array_values($response['data']);
-		return $response;
-	}
+        $response['data'] = array_values($response['data']);
+        return $response;
+    }
 
-	private function setEndpoint() {
-		$versionArray = explode('.', $this->getVersion());
-		$this->endpointUrl = sprintf(
-			'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
-			$versionArray[0],
-			$versionArray[1],
-			$versionArray[2]
-		);
-	}
+    private function setEndpoint() {
+        $versionArray = explode('.', $this->getVersion());
+        $this->endpointUrl = sprintf(
+            'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
+            $versionArray[0],
+            $versionArray[1],
+            $versionArray[2]
+        );
+    }
 
-	/**
-	 * @param string $version
-	 */
-	public function setVersion($version) {
-		parent::setVersion($version);
-		$this->setEndpoint();
-	}
+    /**
+     * @param string $version
+     */
+    public function setVersion($version) {
+        parent::setVersion($version);
+        $this->setEndpoint();
+    }
 }

lib/private/App/AppStore/Fetcher/Fetcher.php

Indentation +154 added lines, -154 removed lines

@@ -32,158 +32,158 @@
 use OCP\ILogger;
 
 abstract class Fetcher {
-	const INVALIDATE_AFTER_SECONDS = 300;
-
-	/** @var IAppData */
-	protected $appData;
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var IConfig */
-	protected $config;
-	/** @var Ilogger */
-	protected $logger;
-	/** @var string */
-	protected $fileName;
-	/** @var string */
-	protected $endpointUrl;
-	/** @var string */
-	protected $version;
-
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		$this->appData = $appDataFactory->get('appstore');
-		$this->clientService = $clientService;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Fetches the response from the server
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-
-		if (!$appstoreenabled) {
-			return [];
-		}
-
-		$options = [];
-
-		if ($ETag !== '') {
-			$options['headers'] = [
-				'If-None-Match' => $ETag,
-			];
-		}
-
-		$client = $this->clientService->newClient();
-		$response = $client->get($this->endpointUrl, $options);
-
-		$responseJson = [];
-		if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
-			$responseJson['data'] = json_decode($content, true);
-		} else {
-			$responseJson['data'] = json_decode($response->getBody(), true);
-			$ETag = $response->getHeader('ETag');
-		}
-
-		$responseJson['timestamp'] = $this->timeFactory->getTime();
-		$responseJson['ncversion'] = $this->getVersion();
-		if ($ETag !== '') {
-			$responseJson['ETag'] = $ETag;
-		}
-
-		return $responseJson;
-	}
-
-	/**
-	 * Returns the array with the categories on the appstore server
-	 *
-	 * @return array
-	 */
-	public function get() {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-
-		if (!$appstoreenabled) {
-			return [];
-		}
-
-		$rootFolder = $this->appData->getFolder('/');
-
-		$ETag = '';
-		$content = '';
-
-		try {
-			// File does already exists
-			$file = $rootFolder->getFile($this->fileName);
-			$jsonBlob = json_decode($file->getContent(), true);
-			if (is_array($jsonBlob)) {
-
-				// No caching when the version has been updated
-				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
-
-					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
-						return $jsonBlob['data'];
-					}
-
-					if (isset($jsonBlob['ETag'])) {
-						$ETag = $jsonBlob['ETag'];
-						$content = json_encode($jsonBlob['data']);
-					}
-				}
-			}
-		} catch (NotFoundException $e) {
-			// File does not already exists
-			$file = $rootFolder->newFile($this->fileName);
-		}
-
-		// Refresh the file content
-		try {
-			$responseJson = $this->fetch($ETag, $content);
-			$file->putContent(json_encode($responseJson));
-			return json_decode($file->getContent(), true)['data'];
-		} catch (ConnectException $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher']);
-			return [];
-		} catch (\Exception $e) {
-			return [];
-		}
-	}
-
-	/**
-	 * Get the currently Nextcloud version
-	 * @return string
-	 */
-	protected function getVersion() {
-		if ($this->version === null) {
-			$this->version = $this->config->getSystemValue('version', '0.0.0');
-		}
-		return $this->version;
-	}
-
-	/**
-	 * Set the current Nextcloud version
-	 * @param string $version
-	 */
-	public function setVersion($version) {
-		$this->version = $version;
-	}
+    const INVALIDATE_AFTER_SECONDS = 300;
+
+    /** @var IAppData */
+    protected $appData;
+    /** @var IClientService */
+    protected $clientService;
+    /** @var ITimeFactory */
+    protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var Ilogger */
+    protected $logger;
+    /** @var string */
+    protected $fileName;
+    /** @var string */
+    protected $endpointUrl;
+    /** @var string */
+    protected $version;
+
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        $this->appData = $appDataFactory->get('appstore');
+        $this->clientService = $clientService;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Fetches the response from the server
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+
+        if (!$appstoreenabled) {
+            return [];
+        }
+
+        $options = [];
+
+        if ($ETag !== '') {
+            $options['headers'] = [
+                'If-None-Match' => $ETag,
+            ];
+        }
+
+        $client = $this->clientService->newClient();
+        $response = $client->get($this->endpointUrl, $options);
+
+        $responseJson = [];
+        if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
+            $responseJson['data'] = json_decode($content, true);
+        } else {
+            $responseJson['data'] = json_decode($response->getBody(), true);
+            $ETag = $response->getHeader('ETag');
+        }
+
+        $responseJson['timestamp'] = $this->timeFactory->getTime();
+        $responseJson['ncversion'] = $this->getVersion();
+        if ($ETag !== '') {
+            $responseJson['ETag'] = $ETag;
+        }
+
+        return $responseJson;
+    }
+
+    /**
+     * Returns the array with the categories on the appstore server
+     *
+     * @return array
+     */
+    public function get() {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+
+        if (!$appstoreenabled) {
+            return [];
+        }
+
+        $rootFolder = $this->appData->getFolder('/');
+
+        $ETag = '';
+        $content = '';
+
+        try {
+            // File does already exists
+            $file = $rootFolder->getFile($this->fileName);
+            $jsonBlob = json_decode($file->getContent(), true);
+            if (is_array($jsonBlob)) {
+
+                // No caching when the version has been updated
+                if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
+
+                    // If the timestamp is older than 300 seconds request the files new
+                    if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+                        return $jsonBlob['data'];
+                    }
+
+                    if (isset($jsonBlob['ETag'])) {
+                        $ETag = $jsonBlob['ETag'];
+                        $content = json_encode($jsonBlob['data']);
+                    }
+                }
+            }
+        } catch (NotFoundException $e) {
+            // File does not already exists
+            $file = $rootFolder->newFile($this->fileName);
+        }
+
+        // Refresh the file content
+        try {
+            $responseJson = $this->fetch($ETag, $content);
+            $file->putContent(json_encode($responseJson));
+            return json_decode($file->getContent(), true)['data'];
+        } catch (ConnectException $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher']);
+            return [];
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    /**
+     * Get the currently Nextcloud version
+     * @return string
+     */
+    protected function getVersion() {
+        if ($this->version === null) {
+            $this->version = $this->config->getSystemValue('version', '0.0.0');
+        }
+        return $this->version;
+    }
+
+    /**
+     * Set the current Nextcloud version
+     * @param string $version
+     */
+    public function setVersion($version) {
+        $this->version = $version;
+    }
 }

lib/private/App/AppStore/Fetcher/CategoryFetcher.php

Indentation +22 added lines, -22 removed lines

@@ -28,26 +28,26 @@
 use OCP\ILogger;
 
 class CategoryFetcher extends Fetcher {
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger
-		);
-		$this->fileName = 'categories.json';
-		$this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
-	}
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger
+        );
+        $this->fileName = 'categories.json';
+        $this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
+    }
 }