Skip to content

AppFetcher: Distinguish between fileName and endpointName #18786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jan 12, 2020
Merged

AppFetcher: Distinguish between fileName and endpointName #18786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/private/App/AppStore/Fetcher/AppFetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public function __construct(Factory $appDataFactory,
);

$this->fileName = 'apps.json';
$this->endpointName = 'apps.json';
$this->compareVersion = $compareVersion;
$this->ignoreMaxVersion = true;
}
Expand Down
1 change: 1 addition & 0 deletions lib/private/App/AppStore/Fetcher/CategoryFetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@ public function __construct(Factory $appDataFactory,
$logger
);
$this->fileName = 'categories.json';
$this->endpointName = 'categories.json';
}
}
4 changes: 3 additions & 1 deletion lib/private/App/AppStore/Fetcher/Fetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ abstract class Fetcher {
/** @var string */
protected $fileName;
/** @var string */
protected $endpointName;
/** @var string */
protected $version;
/** @var string */
protected $channel;
Expand Down Expand Up @@ -219,6 +221,6 @@ public function setChannel(string $channel) {
}

protected function getEndpoint(): string {
return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->fileName;
return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
}
}
2,692 changes: 1,387 additions & 1,305 deletions tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
View file
Open in desktop

Large diffs are not rendered by default.