Merge pull request #18786 from nextcloud/bugfix/noid/fix_fileName_apiEndPointName_issue
AppFetcher: Distinguish between fileName and endpointName
This commit is contained in:
commit
11cae98394
|
@ -68,6 +68,7 @@ class AppFetcher extends Fetcher {
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->fileName = 'apps.json';
|
$this->fileName = 'apps.json';
|
||||||
|
$this->endpointName = 'apps.json';
|
||||||
$this->compareVersion = $compareVersion;
|
$this->compareVersion = $compareVersion;
|
||||||
$this->ignoreMaxVersion = true;
|
$this->ignoreMaxVersion = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,5 +53,6 @@ class CategoryFetcher extends Fetcher {
|
||||||
$logger
|
$logger
|
||||||
);
|
);
|
||||||
$this->fileName = 'categories.json';
|
$this->fileName = 'categories.json';
|
||||||
|
$this->endpointName = 'categories.json';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,8 @@ abstract class Fetcher {
|
||||||
/** @var string */
|
/** @var string */
|
||||||
protected $fileName;
|
protected $fileName;
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
protected $endpointName;
|
||||||
|
/** @var string */
|
||||||
protected $version;
|
protected $version;
|
||||||
/** @var string */
|
/** @var string */
|
||||||
protected $channel;
|
protected $channel;
|
||||||
|
@ -219,6 +221,6 @@ abstract class Fetcher {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getEndpoint(): string {
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue