Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-10 09:13:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added progress bar to command downloading new GeoLite2 database file

Browse Source
This commit is contained in:
Alejandro Celaya
2018-11-12 21:30:30 +01:00
parent 58e8c8e182
commit 9964d3e24b
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/Common/src/IpGeolocation/GeoLite2/DbUpdater.php
View File

@@ -42,22 +42,23 @@ class DbUpdater implements DbUpdaterInterface
/**
* @throws RuntimeException
*/
public function downloadFreshCopy(): void
public function downloadFreshCopy(callable $handleProgress = null): void
{
$tempDir = $this->options->getTempDir();
$compressedFile = sprintf('%s/%s', $tempDir, self::DB_COMPRESSED_FILE);
$this->downloadDbFile($compressedFile);
$this->downloadDbFile($compressedFile, $handleProgress);
$tempFullPath = $this->extractDbFile($compressedFile, $tempDir);
$this->copyNewDbFile($tempFullPath);
$this->deleteTempFiles([$compressedFile, $tempFullPath]);
}
private function downloadDbFile(string $dest): void
private function downloadDbFile(string $dest, callable $handleProgress = null): void
{
try {
$this->httpClient->request(RequestMethod::METHOD_GET, $this->options->getDownloadFrom(), [
RequestOptions::SINK => $dest,
RequestOptions::PROGRESS => $handleProgress,
]);
} catch (Throwable | GuzzleException $e) {
throw new RuntimeException(

2
module/Common/src/IpGeolocation/GeoLite2/DbUpdaterInterface.php
View File

@@ -10,5 +10,5 @@ interface DbUpdaterInterface
/**
* @throws RuntimeException
*/
public function downloadFreshCopy(): void;
public function downloadFreshCopy(callable $handleProgress = null): void;
}