change urls and add callback

porox · Oct 5, 2022 · 3a60136 · 3a60136
1 parent 21c73aa
commit 3a60136
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -24,7 +24,7 @@ public function sendFiles(CreateFileConfig $config): ResponseInterface
         try {
             foreach ($config->getFiles() as $file) {
                 $dropmeFilesDto = $this->api->create($file->getSize(), $config->getPeriod(), $dropmeFilesDto);
-                $this->api->uploadFile($file, $dropmeFilesDto);
+                $this->api->uploadFile($file, $dropmeFilesDto, $config->getCallback());
                 $this->api->save($config->getPeriod(), $dropmeFilesDto);
             }
             if (null === $dropmeFilesDto) {

diff --git a/src/CreateFileConfig.php b/src/CreateFileConfig.php
@@ -17,6 +17,11 @@ class CreateFileConfig
 
     protected $period = PeriodTypes::DAYS_3;
 
+    /**
+     * @var ?callable
+     */
+    protected $callback;
+
     public function isNeedPassword(): bool
     {
         return $this->needPassword;
@@ -50,4 +55,14 @@ public function getFiles(): array
     {
         return $this->files;
     }
+
+    public function getCallback(): ?callable
+    {
+        return $this->callback;
+    }
+
+    public function setCallback(?callable $callback): void
+    {
+        $this->callback = $callback;
+    }
 }
diff --git a/src/DropmefilesAPI.php b/src/DropmefilesAPI.php
@@ -57,7 +57,7 @@ public function create(int $size, int $period = PeriodTypes::DAYS_3, ?Dropmefile
         } else {
             $dto = new DropmefilesDto();
         }
-        $response = $this->httpClient->request('POST', self::HOST . '/s3/upload/create', [
+        $response = $this->httpClient->request('POST', self::HOST . '/s5/upload/create', [
             RequestOptions::HEADERS => array_merge($this->getBaseHeaders(), [
                 'Content-Type' => 'application/x-www-form-urlencoded; charset=UTF-8',
             ]),
@@ -79,7 +79,7 @@ public function create(int $size, int $period = PeriodTypes::DAYS_3, ?Dropmefile
      */
     public function password(DropmefilesDto $dto): bool
     {
-        $response = $this->httpClient->request('POST', self::HOST . '/s3/upload/password', [
+        $response = $this->httpClient->request('POST', self::HOST . '/s5/upload/password', [
             RequestOptions::HEADERS => array_merge($this->getBaseHeaders(), [
                 'Content-Type' => 'application/x-www-form-urlencoded',
             ]),
@@ -102,7 +102,7 @@ public function password(DropmefilesDto $dto): bool
      * @throws DropmefilesException
      * @throws GuzzleException
      */
-    public function uploadFile(SplFileInfo $fileInfo, DropmefilesDto $dto): bool
+    public function uploadFile(SplFileInfo $fileInfo, DropmefilesDto $dto, ?callable $callback): bool
     {
         $res = [];
         $fileDto = new DropmefilesFileDto(
@@ -118,6 +118,9 @@ public function uploadFile(SplFileInfo $fileInfo, DropmefilesDto $dto): bool
         $chunkSize = 1 === $chunks ? $fileInfo->getSize() : self::CHUNK_SIZE;
         $sendFileSize = 0;
         for ($chunk = 0; $chunk < $chunks; ++$chunk) {
+            if ($callback !== null) {
+                $callback(['chunks'=> $chunks,'chunk' => $chunk]);
+            }
             $content = fread($fileStream, $chunkSize);
             $this->sendChunk(
                 $content,
@@ -146,7 +149,7 @@ public function uploadFile(SplFileInfo $fileInfo, DropmefilesDto $dto): bool
      */
     public function save(int $period, DropmefilesDto $dto): bool
     {
-        $response = $this->httpClient->request('POST', self::HOST . '/s3/upload/save', [
+        $response = $this->httpClient->request('POST', self::HOST . '/s5/upload/save', [
             RequestOptions::HEADERS => array_merge($this->getBaseHeaders(), [
                 'Content-Type' => 'application/x-www-form-urlencoded',
             ]),
@@ -220,7 +223,7 @@ private function sendChunk(
         try {
             $response = $this->httpClient->request(
                 'POST',
-                $this::HOST . '/s3/uploadch?name=' . urlencode($fileInfo->getFilename()) . '&chunk=' . $chunk .
+                $this::HOST . '/s5/uploadrmbl?name=' . urlencode($fileInfo->getFilename()) . '&chunk=' . $chunk .
                 '&chunks=' . $chunks . '&updir=' . $uid,
                 [
                     RequestOptions::HEADERS => array_merge($this->getBaseHeaders(), [

diff --git a/src/DropmefilesAPIInteface.php b/src/DropmefilesAPIInteface.php
@@ -10,7 +10,7 @@ interface DropmefilesAPIInteface
 {
     public function create(int $size, int $period, ?DropmefilesDto $dto = null): DropmefilesDto;
 
-    public function uploadFile(SplFileInfo $fileInfo, DropmefilesDto $dto): bool;
+    public function uploadFile(SplFileInfo $fileInfo, DropmefilesDto $dto, ?callable $callback): bool;
 
     public function save(int $period, DropmefilesDto $dto): bool;