-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1940 from nextcloud/new-appstore
Use new appstore API
- Loading branch information
Showing
46 changed files
with
2,228 additions
and
2,556 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Lukas Reschke <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OC\App\AppStore\Fetcher; | ||
|
|
||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\Files\IAppData; | ||
| use OCP\Http\Client\IClientService; | ||
| use OCP\IConfig; | ||
|
|
||
| class AppFetcher extends Fetcher { | ||
| /** | ||
| * @param IAppData $appData | ||
| * @param IClientService $clientService | ||
| * @param ITimeFactory $timeFactory | ||
| * @param IConfig $config; | ||
| */ | ||
| public function __construct(IAppData $appData, | ||
| IClientService $clientService, | ||
| ITimeFactory $timeFactory, | ||
| IConfig $config) { | ||
| parent::__construct( | ||
| $appData, | ||
| $clientService, | ||
| $timeFactory | ||
| ); | ||
|
|
||
| $this->fileName = 'apps.json'; | ||
|
|
||
| $versionArray = \OC_Util::getVersion(); | ||
| $this->endpointUrl = sprintf( | ||
| 'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json', | ||
| $versionArray[0], | ||
| $versionArray[1], | ||
| $versionArray[2] | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Lukas Reschke <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OC\App\AppStore\Fetcher; | ||
|
|
||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\Files\IAppData; | ||
| use OCP\Http\Client\IClientService; | ||
|
|
||
| class CategoryFetcher extends Fetcher { | ||
| /** | ||
| * @param IAppData $appData | ||
| * @param IClientService $clientService | ||
| * @param ITimeFactory $timeFactory | ||
| */ | ||
| public function __construct(IAppData $appData, | ||
| IClientService $clientService, | ||
| ITimeFactory $timeFactory) { | ||
| parent::__construct( | ||
| $appData, | ||
| $clientService, | ||
| $timeFactory | ||
| ); | ||
| $this->fileName = 'categories.json'; | ||
| $this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Lukas Reschke <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OC\App\AppStore\Fetcher; | ||
|
|
||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\Files\IAppData; | ||
| use OCP\Files\NotFoundException; | ||
| use OCP\Http\Client\IClientService; | ||
|
|
||
| abstract class Fetcher { | ||
| const INVALIDATE_AFTER_SECONDS = 300; | ||
|
|
||
| /** @var IAppData */ | ||
| private $appData; | ||
| /** @var IClientService */ | ||
| private $clientService; | ||
| /** @var ITimeFactory */ | ||
| private $timeFactory; | ||
| /** @var string */ | ||
| protected $fileName; | ||
| /** @var string */ | ||
| protected $endpointUrl; | ||
|
|
||
| /** | ||
| * @param IAppData $appData | ||
| * @param IClientService $clientService | ||
| * @param ITimeFactory $timeFactory | ||
| */ | ||
| public function __construct(IAppData $appData, | ||
| IClientService $clientService, | ||
| ITimeFactory $timeFactory) { | ||
| $this->appData = $appData; | ||
| $this->clientService = $clientService; | ||
| $this->timeFactory = $timeFactory; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the array with the categories on the appstore server | ||
| * | ||
| * @return array | ||
| */ | ||
| public function get() { | ||
| $rootFolder = $this->appData->getFolder('/'); | ||
|
|
||
| try { | ||
| // File does already exists | ||
| $file = $rootFolder->getFile($this->fileName); | ||
| $jsonBlob = json_decode($file->getContent(), true); | ||
| if(is_array($jsonBlob)) { | ||
| // 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']; | ||
| } | ||
| } | ||
| } catch (NotFoundException $e) { | ||
| // File does not already exists | ||
| $file = $rootFolder->newFile($this->fileName); | ||
| } | ||
|
|
||
| // Refresh the file content | ||
| $client = $this->clientService->newClient(); | ||
| try { | ||
| $response = $client->get($this->endpointUrl); | ||
| $responseJson = []; | ||
| $responseJson['data'] = json_decode($response->getBody(), true); | ||
| $responseJson['timestamp'] = $this->timeFactory->getTime(); | ||
| $file->putContent(json_encode($responseJson)); | ||
| return json_decode($file->getContent(), true)['data']; | ||
| } catch (\Exception $e) { | ||
| return []; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.