From 001e7845ba9e7134fde7a55580d036235b18d6ce Mon Sep 17 00:00:00 2001
From: Joseph <roboticsexpert@gmail.com>
Date: Mon, 21 Oct 2019 09:24:43 +0330
Subject: [PATCH 1/5] add streamble and improve url downloader

---
 composer.json                                 |  4 +-
 .../Storage/StreamableFileInterface.php       | 11 ++++++
 src/Storage/File/ProcessableFile.php          | 10 ++++-
 src/Storage/File/SplFileInfoStorableFile.php  | 18 +++++++--
 src/Storage/Laravel/LaravelStorage.php        | 37 ++++++++++++++-----
 src/Support/Download/UrlDownloader.php        | 17 ++++++++-
 6 files changed, 79 insertions(+), 18 deletions(-)
 create mode 100644 src/Contracts/Storage/StreamableFileInterface.php

diff --git a/composer.json b/composer.json
index 595d617..006b362 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "czim/file-handling",
+    "name": "sibche/file-handling",
     "description": "File Handling Helper",
     "keywords": [ "file", "uploads", "storage", "s3" ],
-    "homepage": "https://github.com/czim",
+    "homepage": "https://github.com/sibche",
     "require": {
         "php": ">=5.5.9",
         "imagine/imagine": "^0.7",
diff --git a/src/Contracts/Storage/StreamableFileInterface.php b/src/Contracts/Storage/StreamableFileInterface.php
new file mode 100644
index 0000000..93c476f
--- /dev/null
+++ b/src/Contracts/Storage/StreamableFileInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Czim\FileHandling\Contracts\Storage;
+
+
+interface StreamableFileInterface
+{
+
+    public function stream($function);
+
+}
diff --git a/src/Storage/File/ProcessableFile.php b/src/Storage/File/ProcessableFile.php
index 5dcc0f5..7581753 100644
--- a/src/Storage/File/ProcessableFile.php
+++ b/src/Storage/File/ProcessableFile.php
@@ -2,11 +2,12 @@
 namespace Czim\FileHandling\Storage\File;
 
 use Czim\FileHandling\Contracts\Storage\ProcessableFileInterface;
+use Czim\FileHandling\Contracts\Storage\StreamableFileInterface;
 use Czim\FileHandling\Exceptions\StorableFileCouldNotBeDeletedException;
 use RuntimeException;
 use SplFileInfo;
 
-class ProcessableFile extends AbstractStorableFile implements ProcessableFileInterface
+class ProcessableFile extends AbstractStorableFile implements ProcessableFileInterface,StreamableFileInterface
 {
 
     /**
@@ -107,4 +108,11 @@ public function path()
         return $this->file->getRealPath();
     }
 
+    public function stream($function)
+    {
+        $stream = fopen($this->file->getRealPath(), 'r+');
+        $output = $function($stream);
+        fclose($stream);
+        return $output;
+    }
 }
diff --git a/src/Storage/File/SplFileInfoStorableFile.php b/src/Storage/File/SplFileInfoStorableFile.php
index 0b90553..def58dd 100644
--- a/src/Storage/File/SplFileInfoStorableFile.php
+++ b/src/Storage/File/SplFileInfoStorableFile.php
@@ -1,12 +1,14 @@
 <?php
+
 namespace Czim\FileHandling\Storage\File;
 
+use Czim\FileHandling\Contracts\Storage\StreamableFileInterface;
 use Czim\FileHandling\Exceptions\StorableFileCouldNotBeDeletedException;
 use RuntimeException;
 use SplFileInfo;
 use UnexpectedValueException;
 
-class SplFileInfoStorableFile extends AbstractStorableFile
+class SplFileInfoStorableFile extends AbstractStorableFile implements StreamableFileInterface
 {
 
     /**
@@ -19,11 +21,12 @@ class SplFileInfoStorableFile extends AbstractStorableFile
      * Initializes the storable file with mixed data.
      *
      * @param mixed $data
+     *
      * @return $this
      */
     public function setData($data)
     {
-        if ( ! ($data instanceof SplFileInfo)) {
+        if (!($data instanceof SplFileInfo)) {
             throw new UnexpectedValueException('Expected SplFileInfo instance');
         }
 
@@ -39,7 +42,7 @@ public function setData($data)
      */
     protected function setDerivedFileProperties()
     {
-        if ( ! $this->file || ! file_exists($this->file->getRealPath())) {
+        if (!$this->file || !file_exists($this->file->getRealPath())) {
             throw new RuntimeException("Local file not found at '{$this->file->getPath()}'");
         }
 
@@ -85,7 +88,7 @@ public function delete()
             );
         }
 
-        if ( ! $success) {
+        if (!$success) {
             // @codeCoverageIgnoreStart
             throw new StorableFileCouldNotBeDeletedException("Failed to unlink '{$this->path()}'");
             // @codeCoverageIgnoreEnd
@@ -100,4 +103,11 @@ public function path()
         return $this->file->getRealPath();
     }
 
+    public function stream($function)
+    {
+        $stream = fopen($this->file->getRealPath(), 'r+');
+        $output = $function($stream);
+        fclose($stream);
+        return $output;
+    }
 }
diff --git a/src/Storage/Laravel/LaravelStorage.php b/src/Storage/Laravel/LaravelStorage.php
index b699ff0..5938ff2 100644
--- a/src/Storage/Laravel/LaravelStorage.php
+++ b/src/Storage/Laravel/LaravelStorage.php
@@ -1,9 +1,11 @@
 <?php
+
 namespace Czim\FileHandling\Storage\Laravel;
 
 use Czim\FileHandling\Contracts\Storage\StorableFileInterface;
 use Czim\FileHandling\Contracts\Storage\StorageInterface;
 use Czim\FileHandling\Contracts\Storage\StoredFileInterface;
+use Czim\FileHandling\Contracts\Storage\StreamableFileInterface;
 use Czim\FileHandling\Exceptions\FileStorageException;
 use Czim\FileHandling\Storage\File\DecoratorStoredFile;
 use Czim\FileHandling\Storage\File\RawStorableFile;
@@ -32,24 +34,26 @@ class LaravelStorage implements StorageInterface
     protected $baseUrl;
 
     /**
-     * @param Filesystem  $filesystem
-     * @param bool        $isLocal
+     * @param Filesystem $filesystem
+     * @param bool $isLocal
      * @param null|string $baseUrl
      */
     public function __construct(
         Filesystem $filesystem,
         $isLocal = true,
         $baseUrl = null
-    ) {
+    )
+    {
         $this->filesystem = $filesystem;
-        $this->isLocal    = $isLocal;
-        $this->baseUrl    = trim($baseUrl ?: '', '/');
+        $this->isLocal = $isLocal;
+        $this->baseUrl = trim($baseUrl ?: '', '/');
     }
-    
+
     /**
      * Returns whether a stored file exists.
      *
      * @param string $path
+     *
      * @return bool
      */
     public function exists($path)
@@ -61,6 +65,7 @@ public function exists($path)
      * Returns a public URL to the stored file.
      *
      * @param string $path
+     *
      * @return string
      */
     public function url($path)
@@ -74,6 +79,7 @@ public function url($path)
      * Note that the mimetype is not filled in here. Tackle this manually if it is required.
      *
      * @param string $path
+     *
      * @return StoredFileInterface
      */
     public function get($path)
@@ -93,14 +99,23 @@ public function get($path)
      * Stores a file.
      *
      * @param StorableFileInterface $file mixed content to store
-     * @param string                $path where the file should be stored, including the filename
+     * @param string $path where the file should be stored, including the filename
+     *
      * @return StoredFileInterface
      * @throws FileStorageException
      */
     public function store(StorableFileInterface $file, $path)
     {
-        if ( ! $this->filesystem->put($path, $file->content())) {
-            throw new FileStorageException("Failed to store '{$file->name()}' to '{$path}'");
+        if ($file instanceof StreamableFileInterface) {
+            $file->stream(function ($stream) use ($file, $path) {
+                if (!$this->filesystem->writeStream($path, $stream)) {
+                    throw new FileStorageException("Failed to store '{$file->name()}' to '{$path}'");
+                }
+            });
+        } else {
+            if (!$this->filesystem->put($path, $file->content())) {
+                throw new FileStorageException("Failed to store '{$file->name()}' to '{$path}'");
+            }
         }
 
         $stored = new DecoratorStoredFile($file);
@@ -113,6 +128,7 @@ public function store(StorableFileInterface $file, $path)
      * Deletes a stored media file.
      *
      * @param string $path
+     *
      * @return bool
      */
     public function delete($path)
@@ -122,11 +138,12 @@ public function delete($path)
 
     /**
      * @param string $path
+     *
      * @return string
      */
     protected function prefixBaseUrl($path)
     {
         return $this->baseUrl . '/' . ltrim($path, '/');
     }
-    
+
 }
diff --git a/src/Support/Download/UrlDownloader.php b/src/Support/Download/UrlDownloader.php
index cbe55dd..424456e 100644
--- a/src/Support/Download/UrlDownloader.php
+++ b/src/Support/Download/UrlDownloader.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Czim\FileHandling\Support\Download;
 
 use Czim\FileHandling\Contracts\Support\MimeTypeHelperInterface;
@@ -28,6 +29,7 @@ public function __construct(MimeTypeHelperInterface $mimeTypeHelper)
      * Downloads from a URL and returns locally stored temporary file.
      *
      * @param string $url
+     *
      * @return string
      * @throws CouldNotRetrieveRemoteFileException
      */
@@ -59,6 +61,7 @@ public function download($url)
      *
      * @param string $url
      * @param string $localPath
+     *
      * @throws CouldNotRetrieveRemoteFileException
      * @codeCoverageIgnore
      */
@@ -67,13 +70,22 @@ protected function downloadToTempLocalPath($url, $localPath)
         $curlError = 'unknown error';
 
         try {
+            $fileStream = fopen($localPath, 'w');
             $ch = curl_init($url);
             curl_setopt($ch, CURLOPT_HEADER, 0);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+            curl_setopt($ch, CURLOPT_FILE, $fileStream);
+
+
             $rawFile = curl_exec($ch);
 
+            die($rawFile);
+
+            curl_close($ch);
+            fclose($fp);
+
             if ($rawFile === false) {
                 $curlError = curl_error($ch);
             }
@@ -112,6 +124,7 @@ protected function downloadToTempLocalPath($url, $localPath)
     /**
      * @param string $path
      * @param string $name
+     *
      * @return string
      * @throws CouldNotRetrieveRemoteFileException
      */
@@ -146,6 +159,7 @@ protected function makeLocalTemporaryPath()
      *
      * @param string $path
      * @param string $newName
+     *
      * @return string
      * @throws CouldNotRetrieveRemoteFileException
      */
@@ -163,7 +177,7 @@ protected function renameFile($path, $newName)
         }
 
         // @codeCoverageIgnoreStart
-        if ( ! $success) {
+        if (!$success) {
             throw new CouldNotRetrieveRemoteFileException("Failed to rename '{$path}' to '{$newName}'");
         }
         // @codeCoverageIgnoreEnd
@@ -175,6 +189,7 @@ protected function renameFile($path, $newName)
      * Normalizes URL for safe cURL use.
      *
      * @param string $url
+     *
      * @return string
      */
     protected function normalizeUrl($url)

From 6bc9037cfb0c5062799967747aceb18a5a17aa97 Mon Sep 17 00:00:00 2001
From: Joseph <roboticsexpert@gmail.com>
Date: Mon, 21 Oct 2019 09:53:04 +0330
Subject: [PATCH 2/5] fix :(

---
 src/Support/Download/UrlDownloader.php | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/Support/Download/UrlDownloader.php b/src/Support/Download/UrlDownloader.php
index 424456e..442ec88 100644
--- a/src/Support/Download/UrlDownloader.php
+++ b/src/Support/Download/UrlDownloader.php
@@ -81,10 +81,7 @@ protected function downloadToTempLocalPath($url, $localPath)
 
             $rawFile = curl_exec($ch);
 
-            die($rawFile);
-
-            curl_close($ch);
-            fclose($fp);
+            fclose($fileStream);
 
             if ($rawFile === false) {
                 $curlError = curl_error($ch);
@@ -105,20 +102,6 @@ protected function downloadToTempLocalPath($url, $localPath)
                 "curl_exec failed while downloading '{$url}': " . $curlError
             );
         }
-
-        try {
-            if (false === file_put_contents($localPath, $rawFile)) {
-                throw new CouldNotRetrieveRemoteFileException('file_put_contents call failed');
-            }
-
-        } catch (Exception $e) {
-
-            throw new CouldNotRetrieveRemoteFileException(
-                'file_put_contents call threw an exception',
-                $e->getCode(),
-                $e
-            );
-        }
     }
 
     /**

From dca42455f7541b5579f572ac6ffaaf9c3474ef99 Mon Sep 17 00:00:00 2001
From: Joseph <roboticsexpert@gmail.com>
Date: Tue, 12 Nov 2019 02:19:37 +0330
Subject: [PATCH 3/5] delete file if exists in streamable put file

---
 src/Storage/Laravel/LaravelStorage.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Storage/Laravel/LaravelStorage.php b/src/Storage/Laravel/LaravelStorage.php
index 5938ff2..c8cd88d 100644
--- a/src/Storage/Laravel/LaravelStorage.php
+++ b/src/Storage/Laravel/LaravelStorage.php
@@ -108,9 +108,11 @@ public function store(StorableFileInterface $file, $path)
     {
         if ($file instanceof StreamableFileInterface) {
             $file->stream(function ($stream) use ($file, $path) {
-                if (!$this->filesystem->writeStream($path, $stream)) {
-                    throw new FileStorageException("Failed to store '{$file->name()}' to '{$path}'");
+                if ($this->filesystem->exists($path)) {
+                    $this->filesystem->delete($path);
                 }
+                if (!$this->filesystem->writeStream($path, $stream))
+                    throw new FileStorageException("Failed to store streamable '{$file->name()}' to '{$path}'");
             });
         } else {
             if (!$this->filesystem->put($path, $file->content())) {

From da89895279becde738a5f0cba7cfaf0ef4494f43 Mon Sep 17 00:00:00 2001
From: Mahdi Youseftabar <roboticsexpert@gmail.com>
Date: Fri, 13 Mar 2020 19:11:00 +0330
Subject: [PATCH 4/5] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 006b362..335f621 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         "imagine/imagine": "^0.7",
         "myclabs/php-enum": "^1.4",
         "psr/container": "^1.0",
-        "symfony/http-foundation": "^3.0|^4.0",
+        "symfony/http-foundation": "^3.0|^4.0|^5.0",
         "ext-curl": "*"
     },
     "require-dev": {

From f6b9d4fbfc5d9de14e2ddf7a5ba05e5b0cd3a507 Mon Sep 17 00:00:00 2001
From: Joseph <roboticsexpert@gmail.com>
Date: Fri, 13 Mar 2020 19:15:40 +0330
Subject: [PATCH 5/5] rollback package name to czim

---
 .idea/workspace.xml | 65 +++++++++++++++++++++++++++++++++++++++++++++
 composer.json       |  4 +--
 2 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..0d46efd
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="da6cc6f8-ad89-478d-b9d3-a9f1dd5f8c39" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+    <execution>
+      <executable />
+    </execution>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1Z51Z4hB7PkbFJSHgx27ptm0quQ" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="da6cc6f8-ad89-478d-b9d3-a9f1dd5f8c39" name="Default Changelist" comment="" />
+      <created>1584114192585</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1584114192585</updated>
+      <workItem from="1584114194531" duration="133000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="100" y="100" width="1240" height="700" key="VCS.FileHistoryDialog" timestamp="1584114250295">
+      <screen x="0" y="0" width="1440" height="900" />
+    </state>
+    <state x="100" y="100" width="1240" height="700" key="VCS.FileHistoryDialog/0.0.1440.900@0.0.1440.900" timestamp="1584114250295" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 335f621..5081696 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "sibche/file-handling",
+    "name": "czim/file-handling",
     "description": "File Handling Helper",
     "keywords": [ "file", "uploads", "storage", "s3" ],
-    "homepage": "https://github.com/sibche",
+    "homepage": "https://github.com/czim",
     "require": {
         "php": ">=5.5.9",
         "imagine/imagine": "^0.7",