From 50a54fb294a165045db7083a29291bbe77f23366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <david@sudomail.ne.jp>
Date: Fri, 9 Mar 2018 23:57:07 +0900
Subject: [PATCH] =?UTF-8?q?File=20uploading=20sucks=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/StoreController.php | 71 +++++-------------------
 resources/assets/js/components/cli.vue   |  9 ++-
 routes/class/store.php                   |  1 +
 3 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php
index fbc9afd..dc9ce23 100644
--- a/app/Http/Controllers/StoreController.php
+++ b/app/Http/Controllers/StoreController.php
@@ -441,74 +441,31 @@ class StoreController extends Controller {
             ->count();
     }
 
-    public function moveFile($directory, $name = null) {
-        //if ($this->)
-    }
+    public function makedir(Request $request) {
+        $id = $request->id;
 
-    public function uploadEntry(Request $request) { // /api/rpc/store/entry/upload
-        // Log::info('Res: '.$request);exit();
-        /* if (!mkdir($this->storePath.'/'.$request->id, 0755, true)) {
+        if (!mkdir($this->storePath.'/'.$id, 0755, true)) {
             Log::error('File MKDIR failed: ');
             exit();
-        } */
+        }
 
-        if (!mkdir($this->storePath.'/'.$request->id.'/screens', 0755, true)) {
+        if (!mkdir($this->storePath.'/'.$id.'/screens', 0755, true)) {
             Log::error('Asset MKDIR failed: ');
             exit();
         }
+    }
 
-        // foreach ($request->upfile as $f) {
-            //Log::info('Name: '.gettype($f));exit();
-//            $f->storeAs('store/'.$request->id, $f, 'public');exit();
-            /* if ($f->storeAs('store/'.$request->id, $f, 'public')) {
-                Log::error('File store failed: ');
-                exit();
-            } */
-        // }
+    public function uploadEntry(Request $request) { // /api/rpc/store/entry/upload
+        header('Access-Control-Allow-Origin: *');
+        $id = $request->id;
 
-        foreach ($request->file('imgfile') as $m) {
-            Log::info('Name: '.$m);
-            Log::info('Name: '.gettype('store/'.$request->id.'/screens'));
-            $m->move('store/'.$request->id.'/screens', $m->getClientOriginalName());
-            // $m->storeAs('store/'.$request->id.'/screens', $m, 'public');
-            // $m->store('store/'.$request->id.'/screens', 'public');
-//            if ($m->storeAs('store/'.$request->id.'/screens', $m, 'public')) {
-//                Log::error('Asset store failed: ');
-//                exit();
-//            }
-        }
-exit();
+        Log::info('Name: '.$request->file('imgfile')); //TMP
+        Log::info('Type: '.gettype($request->file('imgfile'))); // TMP
 
-        /* foreach ($_FILES['fileupload']['tmp_name'] as $key => $files) {
-            if (!empty($_FILES['fileupload']['name'][$key])) {
-                $file_name = $_FILES['fileupload']['name'][$key];
-                $file_tmp = $_FILES['fileupload']['tmp_name'][$key];
+        $request->file('upfile')->move(public_path('storage/store'.$id), $request->file('imgfile')->getClientOriginalName);
+        $request->file('imgfile')->move(public_path('storage/store'.$id.'/screens'), $request->file('imgfile')->getClientOriginalName);
 
-                if (!move_uploaded_file($file_tmp, $this->storePath.'/'.$request->id.'/'.$file_name)) {
-                    $error = $error = error_get_last();
-                    exit();
-                }
-            }
-        }
-
-        foreach ($_FILES['imageupload']['tmp_name'] as $key => $screens) {
-            if (!empty($_FILES['imageupload']['name'][$key])) {
-                $file_name = $_FILES['imageupload']['name'][$key];
-                $file_tmp = $_FILES['imageupload']['tmp_name'][$key];
-
-                if (!move_uploaded_file($file_tmp, $this->storePath.'/'.$request->id.'/screens/'.$file_name)) {
-                    $error = $error = error_get_last();
-                    exit();
-                }
-
-                $kage = $key+1;
-
-                if (!rename($this->storePath.'/'.$request->id.'/screens/'.$file_name, $this->storePath.'/'.$request->id.'/screens/'.$kage.'.png')) {
-                    $error = $error = error_get_last();
-                    exit();
-                }
-            }
-        } */
+        exit(); // TMP
 
         $add = DB::table('str_file')
             ->insert([
diff --git a/resources/assets/js/components/cli.vue b/resources/assets/js/components/cli.vue
index 80834c4..7a07cd7 100644
--- a/resources/assets/js/components/cli.vue
+++ b/resources/assets/js/components/cli.vue
@@ -105,7 +105,8 @@ export default {
         path: this.pwd,
         command: ''
       }],
-      result: []
+      result: [],
+      group: []
     }
   },
   created: function () {
@@ -157,6 +158,12 @@ export default {
         path: this.pwd,
         command: ''
       });
+
+      this.group.push([
+        this.line,
+        this.result
+      ]);
+console.log(this.group);
     },
     ls(pwd) {
       var neopwd = pwd.replace('/', 'sl');
diff --git a/routes/class/store.php b/routes/class/store.php
index 68efdb2..76d75f3 100644
--- a/routes/class/store.php
+++ b/routes/class/store.php
@@ -52,6 +52,7 @@ Route::get('/api/rpc/store/entry/getentryname/{id}', 'StoreController@getEntryNa
 Route::get('/api/rpc/store/entry/getentriesincategory/{cat_id}', 'StoreController@getEntriesInCategory');
 Route::get('/api/rpc/store/entry/countentriesincategory/{cat_id}', 'StoreController@countEntriesInCategory');
 Route::get('/api/rpc/store/entry/countentriesincategoryfull/{cat_id}', 'StoreController@countEntriesInCategoryFull');
+Route::post('/api/rpc/store/entry/makedir', 'StoreController@makedir');
 Route::post('/api/rpc/store/entry/upload', 'StoreController@uploadEntry');
 Route::post('/api/rpc/store/entry/update', 'StoreController@updateEntry');
 Route::post('/api/rpc/store/entry/restore', 'StoreController@restoreEntry');