nextcloud /
server
@@ -34,109 +34,109 @@ |
||
| 34 | 34 | use OCP\ILogger; |
| 35 | 35 | |
| 36 | 36 | class AppFetcher extends Fetcher { |
| 37 | - /** |
|
| 38 | - * @param Factory $appDataFactory |
|
| 39 | - * @param IClientService $clientService |
|
| 40 | - * @param ITimeFactory $timeFactory |
|
| 41 | - * @param IConfig $config |
|
| 42 | - * @param ILogger $logger |
|
| 43 | - */ |
|
| 44 | - public function __construct(Factory $appDataFactory, |
|
| 45 | - IClientService $clientService, |
|
| 46 | - ITimeFactory $timeFactory, |
|
| 47 | - IConfig $config, |
|
| 48 | - ILogger $logger) { |
|
| 49 | - parent::__construct( |
|
| 50 | - $appDataFactory, |
|
| 51 | - $clientService, |
|
| 52 | - $timeFactory, |
|
| 53 | - $config, |
|
| 54 | - $logger |
|
| 55 | - ); |
|
| 37 | + /** |
|
| 38 | + * @param Factory $appDataFactory |
|
| 39 | + * @param IClientService $clientService |
|
| 40 | + * @param ITimeFactory $timeFactory |
|
| 41 | + * @param IConfig $config |
|
| 42 | + * @param ILogger $logger |
|
| 43 | + */ |
|
| 44 | + public function __construct(Factory $appDataFactory, |
|
| 45 | + IClientService $clientService, |
|
| 46 | + ITimeFactory $timeFactory, |
|
| 47 | + IConfig $config, |
|
| 48 | + ILogger $logger) { |
|
| 49 | + parent::__construct( |
|
| 50 | + $appDataFactory, |
|
| 51 | + $clientService, |
|
| 52 | + $timeFactory, |
|
| 53 | + $config, |
|
| 54 | + $logger |
|
| 55 | + ); |
|
| 56 | 56 | |
| 57 | - $this->fileName = 'apps.json'; |
|
| 58 | - $this->setEndpoint(); |
|
| 59 | - } |
|
| 57 | + $this->fileName = 'apps.json'; |
|
| 58 | + $this->setEndpoint(); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * Only returns the latest compatible app release in the releases array |
|
| 63 | - * |
|
| 64 | - * @param string $ETag |
|
| 65 | - * @param string $content |
|
| 66 | - * |
|
| 67 | - * @return array |
|
| 68 | - */ |
|
| 69 | - protected function fetch($ETag, $content) { |
|
| 70 | - /** @var mixed[] $response */ |
|
| 71 | - $response = parent::fetch($ETag, $content); |
|
| 61 | + /** |
|
| 62 | + * Only returns the latest compatible app release in the releases array |
|
| 63 | + * |
|
| 64 | + * @param string $ETag |
|
| 65 | + * @param string $content |
|
| 66 | + * |
|
| 67 | + * @return array |
|
| 68 | + */ |
|
| 69 | + protected function fetch($ETag, $content) { |
|
| 70 | + /** @var mixed[] $response */ |
|
| 71 | + $response = parent::fetch($ETag, $content); |
|
| 72 | 72 | |
| 73 | - $ncVersion = $this->getVersion(); |
|
| 74 | - foreach($response['data'] as $dataKey => $app) { |
|
| 75 | - $releases = []; |
|
| 73 | + $ncVersion = $this->getVersion(); |
|
| 74 | + foreach($response['data'] as $dataKey => $app) { |
|
| 75 | + $releases = []; |
|
| 76 | 76 | |
| 77 | - // Filter all compatible releases |
|
| 78 | - foreach($app['releases'] as $release) { |
|
| 79 | - // Exclude all nightly and pre-releases |
|
| 80 | - if($release['isNightly'] === false |
|
| 81 | - && strpos($release['version'], '-') === false) { |
|
| 82 | - // Exclude all versions not compatible with the current version |
|
| 83 | - $versionParser = new VersionParser(); |
|
| 84 | - $version = $versionParser->getVersion($release['rawPlatformVersionSpec']); |
|
| 85 | - if ( |
|
| 86 | - // Version is bigger or equals to the minimum version of the app |
|
| 87 | - version_compare($ncVersion, $version->getMinimumVersion(), '>=') |
|
| 88 | - // Version is smaller or equals to the maximum version of the app |
|
| 89 | - && version_compare($ncVersion, $version->getMaximumVersion(), '<=') |
|
| 90 | - ) { |
|
| 91 | - $releases[] = $release; |
|
| 92 | - } |
|
| 93 | - } |
|
| 94 | - } |
|
| 77 | + // Filter all compatible releases |
|
| 78 | + foreach($app['releases'] as $release) { |
|
| 79 | + // Exclude all nightly and pre-releases |
|
| 80 | + if($release['isNightly'] === false |
|
| 81 | + && strpos($release['version'], '-') === false) { |
|
| 82 | + // Exclude all versions not compatible with the current version |
|
| 83 | + $versionParser = new VersionParser(); |
|
| 84 | + $version = $versionParser->getVersion($release['rawPlatformVersionSpec']); |
|
| 85 | + if ( |
|
| 86 | + // Version is bigger or equals to the minimum version of the app |
|
| 87 | + version_compare($ncVersion, $version->getMinimumVersion(), '>=') |
|
| 88 | + // Version is smaller or equals to the maximum version of the app |
|
| 89 | + && version_compare($ncVersion, $version->getMaximumVersion(), '<=') |
|
| 90 | + ) { |
|
| 91 | + $releases[] = $release; |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - // Get the highest version |
|
| 97 | - $versions = []; |
|
| 98 | - foreach($releases as $release) { |
|
| 99 | - $versions[] = $release['version']; |
|
| 100 | - } |
|
| 101 | - usort($versions, 'version_compare'); |
|
| 102 | - $versions = array_reverse($versions); |
|
| 103 | - $compatible = false; |
|
| 104 | - if(isset($versions[0])) { |
|
| 105 | - $highestVersion = $versions[0]; |
|
| 106 | - foreach ($releases as $release) { |
|
| 107 | - if ((string)$release['version'] === (string)$highestVersion) { |
|
| 108 | - $compatible = true; |
|
| 109 | - $response['data'][$dataKey]['releases'] = [$release]; |
|
| 110 | - break; |
|
| 111 | - } |
|
| 112 | - } |
|
| 113 | - } |
|
| 114 | - if(!$compatible) { |
|
| 115 | - unset($response['data'][$dataKey]); |
|
| 116 | - } |
|
| 117 | - } |
|
| 96 | + // Get the highest version |
|
| 97 | + $versions = []; |
|
| 98 | + foreach($releases as $release) { |
|
| 99 | + $versions[] = $release['version']; |
|
| 100 | + } |
|
| 101 | + usort($versions, 'version_compare'); |
|
| 102 | + $versions = array_reverse($versions); |
|
| 103 | + $compatible = false; |
|
| 104 | + if(isset($versions[0])) { |
|
| 105 | + $highestVersion = $versions[0]; |
|
| 106 | + foreach ($releases as $release) { |
|
| 107 | + if ((string)$release['version'] === (string)$highestVersion) { |
|
| 108 | + $compatible = true; |
|
| 109 | + $response['data'][$dataKey]['releases'] = [$release]; |
|
| 110 | + break; |
|
| 111 | + } |
|
| 112 | + } |
|
| 113 | + } |
|
| 114 | + if(!$compatible) { |
|
| 115 | + unset($response['data'][$dataKey]); |
|
| 116 | + } |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | - $response['data'] = array_values($response['data']); |
|
| 120 | - return $response; |
|
| 121 | - } |
|
| 119 | + $response['data'] = array_values($response['data']); |
|
| 120 | + return $response; |
|
| 121 | + } |
|
| 122 | 122 | |
| 123 | - private function setEndpoint() { |
|
| 124 | - $versionArray = explode('.', $this->getVersion()); |
|
| 125 | - $this->endpointUrl = sprintf( |
|
| 126 | - 'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json', |
|
| 127 | - $versionArray[0], |
|
| 128 | - $versionArray[1], |
|
| 129 | - $versionArray[2] |
|
| 130 | - ); |
|
| 131 | - } |
|
| 123 | + private function setEndpoint() { |
|
| 124 | + $versionArray = explode('.', $this->getVersion()); |
|
| 125 | + $this->endpointUrl = sprintf( |
|
| 126 | + 'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json', |
|
| 127 | + $versionArray[0], |
|
| 128 | + $versionArray[1], |
|
| 129 | + $versionArray[2] |
|
| 130 | + ); |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - /** |
|
| 134 | - * @param string $version |
|
| 135 | - * @param string $filename |
|
| 136 | - */ |
|
| 137 | - public function setVersion(string $version, string $fileName = 'apps.json') { |
|
| 138 | - parent::setVersion($version); |
|
| 139 | - $this->fileName = $fileName; |
|
| 140 | - $this->setEndpoint(); |
|
| 141 | - } |
|
| 133 | + /** |
|
| 134 | + * @param string $version |
|
| 135 | + * @param string $filename |
|
| 136 | + */ |
|
| 137 | + public function setVersion(string $version, string $fileName = 'apps.json') { |
|
| 138 | + parent::setVersion($version); |
|
| 139 | + $this->fileName = $fileName; |
|
| 140 | + $this->setEndpoint(); |
|
| 141 | + } |
|
| 142 | 142 | } |
@@ -71,13 +71,13 @@ discard block |
||
| 71 | 71 | $response = parent::fetch($ETag, $content); |
| 72 | 72 | |
| 73 | 73 | $ncVersion = $this->getVersion(); |
| 74 | - foreach($response['data'] as $dataKey => $app) { |
|
| 74 | + foreach ($response['data'] as $dataKey => $app) { |
|
| 75 | 75 | $releases = []; |
| 76 | 76 | |
| 77 | 77 | // Filter all compatible releases |
| 78 | - foreach($app['releases'] as $release) { |
|
| 78 | + foreach ($app['releases'] as $release) { |
|
| 79 | 79 | // Exclude all nightly and pre-releases |
| 80 | - if($release['isNightly'] === false |
|
| 80 | + if ($release['isNightly'] === false |
|
| 81 | 81 | && strpos($release['version'], '-') === false) { |
| 82 | 82 | // Exclude all versions not compatible with the current version |
| 83 | 83 | $versionParser = new VersionParser(); |
@@ -95,23 +95,23 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | // Get the highest version |
| 97 | 97 | $versions = []; |
| 98 | - foreach($releases as $release) { |
|
| 98 | + foreach ($releases as $release) { |
|
| 99 | 99 | $versions[] = $release['version']; |
| 100 | 100 | } |
| 101 | 101 | usort($versions, 'version_compare'); |
| 102 | 102 | $versions = array_reverse($versions); |
| 103 | 103 | $compatible = false; |
| 104 | - if(isset($versions[0])) { |
|
| 104 | + if (isset($versions[0])) { |
|
| 105 | 105 | $highestVersion = $versions[0]; |
| 106 | 106 | foreach ($releases as $release) { |
| 107 | - if ((string)$release['version'] === (string)$highestVersion) { |
|
| 107 | + if ((string) $release['version'] === (string) $highestVersion) { |
|
| 108 | 108 | $compatible = true; |
| 109 | 109 | $response['data'][$dataKey]['releases'] = [$release]; |
| 110 | 110 | break; |
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - if(!$compatible) { |
|
| 114 | + if (!$compatible) { |
|
| 115 | 115 | unset($response['data'][$dataKey]); |
| 116 | 116 | } |
| 117 | 117 | } |
