update download logic

Author: yueziii

src/StorageManager.php

@@ -116,7 +116,6 @@ public function fetch(Request $request)
                     event(new Catched($img));
                 }
             }
-            $img['filename'] = $filename;
             unset($img['file']);
             array_push($list, $img);
         }
@@ -134,42 +133,46 @@ public function fetch(Request $request)
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return Array
+     * @return Array $info
      */
     private function download($url, $config)
     {
-        $imgUrl = htmlspecialchars($url);
-        $imgUrl = str_replace('&', '&', $imgUrl);
-        $pathRes = parse_url($imgUrl);
-        $queryString = isset($pathRes['query']) ? $pathRes['query'] : '';
-        $imgUrl = str_replace('?' . $queryString, '', $imgUrl);
-        if (strpos($imgUrl, 'http') !== 0) {
+        if (strpos($url, 'http') !== 0) {
             return $this->error('ERROR_HTTP_LINK');
         }
-
-        $context = stream_context_create(
-            array('http' => array(
-                'follow_location' => false, // don't follow redirects
-            ))
-        );
-        $file = fopen($imgUrl . '?' . $queryString, 'r', false, $context);
-        $img = stream_get_contents($file);
-        fclose($file);
-        preg_match('/[\/]([^\/]*)[\.]?[^\.\/]*$/', $imgUrl, $m);
-        $original = $m ? $m[1] : '';
-        $ext = strtolower(strrchr($original, '.'));
+        $pathRes = parse_url($url);
+        $img = new \SplFileInfo($pathRes['path']);
+        $original = $img->getFilename();
+        $ext = $img->getExtension();
         $title = config('ueditor.hash_filename') ? md5($original) . $ext : $original;
         $filename = $this->formatPath($config['path_format'], $title);
-        return [
+        $info = [
             'state' => 'SUCCESS',
             'url' => $this->getUrl($filename),
             'title' => $title,
             'original' => $original,
             'source' => $url,
-            'size' => strlen($img),
-            'file' => $img,
+            'size' => 0,
+            'file' => '',
             'filename' => $filename,
         ];
+
+        $context = stream_context_create(
+            array('http' => array(
+                'follow_location' => false, // don't follow redirects
+            ))
+        );
+        $file = fopen($url, 'r', false, $context);
+        if ($file === false) {
+            $info['state'] = 'ERROR';
+            return $info;
+        }
+        $content = stream_get_contents($file);
+        fclose($file);
+        
+        $info['file'] = $content;
+        $info['siez'] = strlen($content);
+        return $info;
     }
 
     /**