fix: Download telegram files

Add method Core::downloadFile
Mateodioev · Dec 2, 2023 · e1b70ea · e1b70ea
1 parent 6fb9666
commit e1b70ea
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 27 deletions.
diff --git a/src/Core.php b/src/Core.php
@@ -4,7 +4,7 @@
 
 use Mateodioev\Bots\Telegram\Config\Types as TypesConfig;
 use Mateodioev\Bots\Telegram\Http\{AsyncClient, SyncClient, Request as HttpClient, HttpException};
-use Mateodioev\Bots\Telegram\Types\{Response, Error};
+use Mateodioev\Bots\Telegram\Types\{File, Response, Error};
 use Mateodioev\Bots\Telegram\Exception\{TelegramParamException, TelegramApiException};
 use Mateodioev\Bots\Telegram\Interfaces\{MethodInterface, TelegramInterface, TypesInterface};
 use Mateodioev\Request\{Request, ResponseException};
@@ -182,27 +182,18 @@ private function parseRequestResult(MethodInterface $method): mixed
     /**
      * Download file sent to the bot
      *
-     * @param string $file_path Use `$this->request(Method::create(['file_id' => 'bot-file_id'], 'getFile')->setReturnType(File::class))` to get file path
+     * @param string $filePath Use `$this->request(Method::create(['file_id' => 'bot-file_id'], 'getFile')->setReturnType(File::class))` to get file path
      * @param string $destination Document name to save the file
      */
-    public function download(string $file_path, string $destination, int $timeout = 30): bool
+    public function download(string $filePath, string $destination): bool
     {
-        $fh = fopen($destination, 'w');
-
-        // TODO: change this
-        $req = Request::GET($this->file_link)
-          ->addOpt(CURLOPT_FILE, $fh)
-          ->addOpt(CURLOPT_TIMEOUT, $timeout);
-
-        try {
-            $res = $req->Run($file_path);
+        return $this->getClient()->new($this->file_link)
+            ->download($filePath, $destination);
+    }
 
-            return ($res->toJson(true) !== $res);
-        } catch (RequestException | ResponseException) {
-            return false;
-        } finally {
-            fclose($fh);
-        }
+    public function downloadFile(File $file, string $destination): bool
+    {
+        return $this->download($file->file_path, $destination);
     }
 
     /**

diff --git a/src/Http/AsyncClient.php b/src/Http/AsyncClient.php
@@ -84,10 +84,10 @@ public function setTimeout(int $timeout): static
         return $this;
     }
 
-    private function executeRequest(): \Amp\Http\Client\Response
+    private function executeRequest(AsyncRequest $request): \Amp\Http\Client\Response
     {
         try {
-            return $this->client->request($this->request);
+            return $this->client->request($request);
         } catch (Throwable $e) {
             throw new HttpException($e->getMessage(), $e->getCode(), $e);
         }
@@ -96,7 +96,11 @@ private function executeRequest(): \Amp\Http\Client\Response
     public function run(): Response
     {
         try {
-            return new Response($this->executeRequest()->getBody()->buffer());
+            return new Response(
+                $this->executeRequest($this->request)
+                    ->getBody()
+                    ->buffer()
+            );
         } catch (BufferException|StreamException $e) {
             throw new HttpException($e->getMessage(), $e->getCode(), $e);
         }
@@ -109,13 +113,16 @@ public function isAsync(): bool
 
     public function download(string $path, string $destination): bool
     {
-        $this->request->setUri(
+        $request = clone $this->request;
+        $request->setUri(
             $this->request
                 ->getUri()
-                ->withPath($path)
+                . $path
         );
 
-        $response = $this->executeRequest();
+        $request->setMethod('GET');
+        $response = $this->executeRequest($request);
+
         try {
             $file = openFile($destination, 'w');
         } catch (FilesystemException $e) {

diff --git a/src/Http/NativeCurlClient.php b/src/Http/NativeCurlClient.php
@@ -57,7 +57,7 @@ public function download(string $path, string $destination): bool
         $file = fopen($destination, 'w');
         $this->request->addOpt(CURLOPT_FILE, $file);
         try {
-            $this->request->run($path);
+            $this->request->setMethod(Methods::GET->value())->run($path);
             fclose($file);
             return true;
         } catch (HttpException) {

diff --git a/src/Interfaces/TelegramInterface.php b/src/Interfaces/TelegramInterface.php
@@ -2,13 +2,24 @@
 
 namespace Mateodioev\Bots\Telegram\Interfaces;
 
+use Mateodioev\Bots\Telegram\Types\File;
 use stdClass;
 
 interface TelegramInterface
 {
     public function request(MethodInterface $method): TypesInterface|stdClass|array;
 
-    public function download(string $file_path, string $destination, int $timeout = 30): bool;
+    /**
+     * Download telegram file
+     * @param string $filePath  File to download
+     * @param string $destination File to save
+     */
+    public function download(string $filePath, string $destination): bool;
+
+    /**
+     * Download telegram file
+     */
+    public function downloadFile(File $file, string $destination): bool;
 
     public function getApiLink(): string;
 

diff --git a/src/Methods/availableMethods.php b/src/Methods/availableMethods.php
@@ -493,7 +493,7 @@ public function getUserProfilePhotos(int $userID, array $params = []): TypesInte
      * @see https://core.telegram.org/bots/api#getfile
      * @return File
      */
-    public function getFile(int $fileID): TypesInterface
+    public function getFile(string $fileID): TypesInterface
     {
         return $this->request(
             Method::create(['file_id' => $fileID])