From e392c9d19ca5ae1cf15f8e3251629c4a22e46629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Sat, 14 Sep 2024 20:44:49 +0900
Subject: [PATCH] Automation init...3

---
 app/Controllers/CrawlerController.php              |  2 +-
 .../{Cloudflare => }/CloudflareLibrary.php         |  2 +-
 .../{MyStorage => }/Mangboard/BoardLibrary.php     |  2 +-
 .../{MyStorage => }/Mangboard/BoardsLibrary.php    |  2 +-
 .../Mangboard/File/ImageLibrary.php                |  2 +-
 .../{MyStorage => }/Mangboard/FileLibrary.php      |  5 ++---
 .../{MyStorage => }/Mangboard/UserLibrary.php      | 14 +++-----------
 app/Libraries/MyAuth/GoogleLibrary.php             |  5 +++--
 app/Libraries/MyAuth/LocalLibrary.php              |  1 +
 app/Libraries/{MyAuth => }/MyAuthLibrary.php       |  2 +-
 app/Libraries/MyCrawler/YamapLibrary.php           | 10 ++++++----
 app/Libraries/{MyCrawler => }/MyCrawlerLibrary.php |  2 +-
 app/Libraries/MySocket/{ => Web}/GoogleLibrary.php |  6 ++++--
 app/Libraries/MySocket/WebLibrary.php              |  1 +
 app/Libraries/{MySocket => }/MySocketLibrary.php   |  2 +-
 app/Libraries/MyStorage/FileLibrary.php            |  3 ++-
 app/Libraries/{MyStorage => }/MyStorageLibrary.php |  2 +-
 app/Libraries/MyUtil/ImageLibrary.php              |  2 +-
 app/Libraries/{MyUtil => }/MyUtilLibrary.php       |  2 +-
 app/Traits/FileTrait.php                           |  7 ++++---
 20 files changed, 37 insertions(+), 37 deletions(-)
 rename app/Libraries/{Cloudflare => }/CloudflareLibrary.php (99%)
 rename app/Libraries/{MyStorage => }/Mangboard/BoardLibrary.php (98%)
 rename app/Libraries/{MyStorage => }/Mangboard/BoardsLibrary.php (96%)
 rename app/Libraries/{MyStorage => }/Mangboard/File/ImageLibrary.php (96%)
 rename app/Libraries/{MyStorage => }/Mangboard/FileLibrary.php (97%)
 rename app/Libraries/{MyStorage => }/Mangboard/UserLibrary.php (78%)
 rename app/Libraries/{MyAuth => }/MyAuthLibrary.php (97%)
 rename app/Libraries/{MyCrawler => }/MyCrawlerLibrary.php (96%)
 rename app/Libraries/MySocket/{ => Web}/GoogleLibrary.php (92%)
 rename app/Libraries/{MySocket => }/MySocketLibrary.php (91%)
 rename app/Libraries/{MyStorage => }/MyStorageLibrary.php (97%)
 rename app/Libraries/{MyUtil => }/MyUtilLibrary.php (84%)

diff --git a/app/Controllers/CrawlerController.php b/app/Controllers/CrawlerController.php
index 7af3859..1225d14 100644
--- a/app/Controllers/CrawlerController.php
+++ b/app/Controllers/CrawlerController.php
@@ -4,7 +4,7 @@ namespace App\Controllers;
 
 use App\Libraries\MyCrawler\YamapLibrary as MyCrawler;
 use App\Controllers\CommonController;
-use App\Libraries\MyStorage\Mangboard\UserLibrary;
+use App\Libraries\Mangboard\UserLibrary;
 
 class CrawlerController extends CommonController
 {
diff --git a/app/Libraries/Cloudflare/CloudflareLibrary.php b/app/Libraries/CloudflareLibrary.php
similarity index 99%
rename from app/Libraries/Cloudflare/CloudflareLibrary.php
rename to app/Libraries/CloudflareLibrary.php
index 1911179..191115e 100644
--- a/app/Libraries/Cloudflare/CloudflareLibrary.php
+++ b/app/Libraries/CloudflareLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\Cloudflare;
+namespace App\Libraries;
 
 abstract class CloudflareLibrary
 {
diff --git a/app/Libraries/MyStorage/Mangboard/BoardLibrary.php b/app/Libraries/Mangboard/BoardLibrary.php
similarity index 98%
rename from app/Libraries/MyStorage/Mangboard/BoardLibrary.php
rename to app/Libraries/Mangboard/BoardLibrary.php
index 89f265a..4c8b3cc 100644
--- a/app/Libraries/MyStorage/Mangboard/BoardLibrary.php
+++ b/app/Libraries/Mangboard/BoardLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MyStorage\Mangboard;
+namespace App\Libraries\Mangboard;
 
 use App\Models\Mangboard\BoardModel;
 use App\Entities\Mangboard\UserEntity;
diff --git a/app/Libraries/MyStorage/Mangboard/BoardsLibrary.php b/app/Libraries/Mangboard/BoardsLibrary.php
similarity index 96%
rename from app/Libraries/MyStorage/Mangboard/BoardsLibrary.php
rename to app/Libraries/Mangboard/BoardsLibrary.php
index cf5dbd4..136bf48 100644
--- a/app/Libraries/MyStorage/Mangboard/BoardsLibrary.php
+++ b/app/Libraries/Mangboard/BoardsLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MyStorage\Mangboard;
+namespace App\Libraries\Mangboard;
 
 use App\Models\Mangboard\BoardsModel;
 use App\Entities\Mangboard\UserEntity;
diff --git a/app/Libraries/MyStorage/Mangboard/File/ImageLibrary.php b/app/Libraries/Mangboard/File/ImageLibrary.php
similarity index 96%
rename from app/Libraries/MyStorage/Mangboard/File/ImageLibrary.php
rename to app/Libraries/Mangboard/File/ImageLibrary.php
index 9eede06..6934353 100644
--- a/app/Libraries/MyStorage/Mangboard/File/ImageLibrary.php
+++ b/app/Libraries/Mangboard/File/ImageLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MyStorage\Mangboard\File;
+namespace App\Libraries\Mangboard\File;
 
 use App\Libraries\MyUtil\ImageLibrary as MyUtilLibrary;
 
diff --git a/app/Libraries/MyStorage/Mangboard/FileLibrary.php b/app/Libraries/Mangboard/FileLibrary.php
similarity index 97%
rename from app/Libraries/MyStorage/Mangboard/FileLibrary.php
rename to app/Libraries/Mangboard/FileLibrary.php
index e9e4e46..1a6d9e0 100644
--- a/app/Libraries/MyStorage/Mangboard/FileLibrary.php
+++ b/app/Libraries/Mangboard/FileLibrary.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace App\Libraries\MyStorage\Mangboard;
+namespace App\Libraries\Mangboard;
 
 use App\Models\Mangboard\FileModel;
-use App\Libraries\MyStorage\Mangboard\File\ImageLibrary;
+use App\Libraries\Mangboard\File\ImageLibrary;
 use App\Libraries\MyStorage\FileLibrary as MyStorageLibrary;
 use App\Entities\Mangboard\UserEntity;
-use App\Entities\Mangboard\FileEntity;
 use App\Entities\Mangboard\BoardsEntity;
 use App\Entities\Mangboard\BoardEntity;
 
diff --git a/app/Libraries/MyStorage/Mangboard/UserLibrary.php b/app/Libraries/Mangboard/UserLibrary.php
similarity index 78%
rename from app/Libraries/MyStorage/Mangboard/UserLibrary.php
rename to app/Libraries/Mangboard/UserLibrary.php
index 8a0801a..4181adb 100644
--- a/app/Libraries/MyStorage/Mangboard/UserLibrary.php
+++ b/app/Libraries/Mangboard/UserLibrary.php
@@ -1,14 +1,13 @@
 <?php
 
-namespace App\Libraries\MyStorage\Mangboard;
+namespace App\Libraries\Mangboard;
 
-use App\Libraries\MySocket\WebLibrary;
+use App\Libraries\MySocket\WebLibrary as MySocketLibrary;
 use App\Models\Mangboard\UserModel;
 use App\Entities\Mangboard\UserEntity;
 
-class UserLibrary extends WebLibrary
+class UserLibrary extends MySocketLibrary
 {
-    private $_web_library = null;
     private $_user_model = null;
     public function __construct() {}
     public function getUserModel(): UserModel
@@ -18,13 +17,6 @@ class UserLibrary extends WebLibrary
         }
         return $this->_user_model;
     }
-    public function getWebLibrary(string $host): WebLibrary
-    {
-        if ($this->_web_library === null) {
-            $this->_web_library = new WebLibrary($host);
-        }
-        return $this->_web_library;
-    }
     // 로그인 메서드
     public function login(string $host, string $id, string $password): bool|UserEntity
     {
diff --git a/app/Libraries/MyAuth/GoogleLibrary.php b/app/Libraries/MyAuth/GoogleLibrary.php
index 71c3822..67f38ec 100644
--- a/app/Libraries/MyAuth/GoogleLibrary.php
+++ b/app/Libraries/MyAuth/GoogleLibrary.php
@@ -2,9 +2,10 @@
 
 namespace App\Libraries\MyAuth;
 
-use App\Entities\SNSUserEntity;
-use App\Entities\UserEntity;
 use App\Libraries\MySocket\GoogleLibrary as MySocketLibrary;
+use App\Libraries\MyAuthLibrary;
+use App\Entities\UserEntity;
+use App\Entities\SNSUserEntity;
 
 class GoogleLibrary extends MyAuthLibrary
 {
diff --git a/app/Libraries/MyAuth/LocalLibrary.php b/app/Libraries/MyAuth/LocalLibrary.php
index 7e8cb79..0f33f3c 100644
--- a/app/Libraries/MyAuth/LocalLibrary.php
+++ b/app/Libraries/MyAuth/LocalLibrary.php
@@ -2,6 +2,7 @@
 
 namespace App\Libraries\MyAuth;
 
+use App\Libraries\MyAuthLibrary;
 use App\Entities\UserEntity;
 
 class LocalLibrary extends MyAuthLibrary
diff --git a/app/Libraries/MyAuth/MyAuthLibrary.php b/app/Libraries/MyAuthLibrary.php
similarity index 97%
rename from app/Libraries/MyAuth/MyAuthLibrary.php
rename to app/Libraries/MyAuthLibrary.php
index 38a5ba8..e5646c5 100644
--- a/app/Libraries/MyAuth/MyAuthLibrary.php
+++ b/app/Libraries/MyAuthLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MyAuth;
+namespace App\Libraries;
 
 use App\Entities\UserEntity;
 use App\Models\UserModel;
diff --git a/app/Libraries/MyCrawler/YamapLibrary.php b/app/Libraries/MyCrawler/YamapLibrary.php
index b85fe32..5dc1c1a 100644
--- a/app/Libraries/MyCrawler/YamapLibrary.php
+++ b/app/Libraries/MyCrawler/YamapLibrary.php
@@ -2,12 +2,14 @@
 
 namespace App\Libraries\MyCrawler;
 
-use Symfony\Component\DomCrawler\Crawler;
-use App\Libraries\MyStorage\Mangboard\FileLibrary as MyStorageLibrary;
-use App\Libraries\MyStorage\Mangboard\BoardsLibrary;
-use App\Libraries\MyStorage\Mangboard\BoardLibrary;
+
+use App\Libraries\MyCrawlerLibrary;
 use App\Libraries\MySocket\WebLibrary as MySocketLibrary;
+use App\Libraries\Mangboard\FileLibrary as MyStorageLibrary;
+use App\Libraries\Mangboard\BoardsLibrary;
+use App\Libraries\Mangboard\BoardLibrary;
 use App\Entities\Mangboard\UserEntity;
+use Symfony\Component\DomCrawler\Crawler;
 use App\Traits\FileTrait;
 
 class YamapLibrary extends MyCrawlerLibrary
diff --git a/app/Libraries/MyCrawler/MyCrawlerLibrary.php b/app/Libraries/MyCrawlerLibrary.php
similarity index 96%
rename from app/Libraries/MyCrawler/MyCrawlerLibrary.php
rename to app/Libraries/MyCrawlerLibrary.php
index 3a74a24..4ea8e76 100644
--- a/app/Libraries/MyCrawler/MyCrawlerLibrary.php
+++ b/app/Libraries/MyCrawlerLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MyCrawler;
+namespace App\Libraries;
 
 use App\Libraries\CommonLibrary;
 use Symfony\Component\DomCrawler\Crawler;
diff --git a/app/Libraries/MySocket/GoogleLibrary.php b/app/Libraries/MySocket/Web/GoogleLibrary.php
similarity index 92%
rename from app/Libraries/MySocket/GoogleLibrary.php
rename to app/Libraries/MySocket/Web/GoogleLibrary.php
index 6bcf590..f670222 100644
--- a/app/Libraries/MySocket/GoogleLibrary.php
+++ b/app/Libraries/MySocket/Web/GoogleLibrary.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace App\Libraries\MySocket;
+namespace App\Libraries\MySocket\Web;
 
-class GoogleLibrary extends WebLibrary
+use App\Libraries\MySocket\WebLibrary as MySocketLibrary;
+
+class GoogleLibrary extends MySocketLibrary
 {
 	private $_client = null;
 	private $_session = null;
diff --git a/app/Libraries/MySocket/WebLibrary.php b/app/Libraries/MySocket/WebLibrary.php
index 7129493..800f718 100644
--- a/app/Libraries/MySocket/WebLibrary.php
+++ b/app/Libraries/MySocket/WebLibrary.php
@@ -4,6 +4,7 @@ namespace App\Libraries\MySocket;
 
 use GuzzleHttp\Cookie\CookieJar;
 use GuzzleHttp\Client;
+use App\Libraries\MySocketLibrary;
 
 class WebLibrary extends MySocketLibrary
 {
diff --git a/app/Libraries/MySocket/MySocketLibrary.php b/app/Libraries/MySocketLibrary.php
similarity index 91%
rename from app/Libraries/MySocket/MySocketLibrary.php
rename to app/Libraries/MySocketLibrary.php
index 9ba7473..3236af0 100644
--- a/app/Libraries/MySocket/MySocketLibrary.php
+++ b/app/Libraries/MySocketLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MySocket;
+namespace App\Libraries;
 
 use App\Libraries\CommonLibrary;
 
diff --git a/app/Libraries/MyStorage/FileLibrary.php b/app/Libraries/MyStorage/FileLibrary.php
index 5998213..cf7e9f7 100644
--- a/app/Libraries/MyStorage/FileLibrary.php
+++ b/app/Libraries/MyStorage/FileLibrary.php
@@ -2,6 +2,7 @@
 
 namespace App\Libraries\MyStorage;
 
+use App\Libraries\MyStorageLibrary;
 use App\Traits\FileTrait;
 
 class FileLibrary extends MyStorageLibrary
@@ -46,7 +47,7 @@ class FileLibrary extends MyStorageLibrary
         $saveFilePath = $fullPath . DIRECTORY_SEPARATOR . $this->getOriginName();
         if (file_exists($saveFilePath)) {
             $fileInfos = pathinfo($saveFilePath, PATHINFO_ALL);
-            $saveFile = $fileInfos['filename'] . "_" . uniqid() . $fileInfos['extension'];
+            $saveFile = base64_encode($fileInfos['filename']) .  "." . $fileInfos['extension'];
             $saveFilePath = $fullPath . DIRECTORY_SEPARATOR . $this->getOriginName();
             log_message("notice", __FUNCTION__ . "파일명 변경 : 원본파일 {$this->getOriginName()}->저장파일 {$saveFile}");
             $this->setOriginName($saveFile);
diff --git a/app/Libraries/MyStorage/MyStorageLibrary.php b/app/Libraries/MyStorageLibrary.php
similarity index 97%
rename from app/Libraries/MyStorage/MyStorageLibrary.php
rename to app/Libraries/MyStorageLibrary.php
index 648d8ec..06f46e9 100644
--- a/app/Libraries/MyStorage/MyStorageLibrary.php
+++ b/app/Libraries/MyStorageLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MyStorage;
+namespace App\Libraries;
 
 use App\Libraries\CommonLibrary;
 
diff --git a/app/Libraries/MyUtil/ImageLibrary.php b/app/Libraries/MyUtil/ImageLibrary.php
index 5ef586c..6d70005 100644
--- a/app/Libraries/MyUtil/ImageLibrary.php
+++ b/app/Libraries/MyUtil/ImageLibrary.php
@@ -2,7 +2,7 @@
 
 namespace App\Libraries\MyUtil;
 
-use App\Libraries\MyUtil\MyUtilLibrary;
+use App\Libraries\MyUtilLibrary;
 use App\Traits\FileTrait;
 
 class ImageLibrary extends MyUtilLibrary
diff --git a/app/Libraries/MyUtil/MyUtilLibrary.php b/app/Libraries/MyUtilLibrary.php
similarity index 84%
rename from app/Libraries/MyUtil/MyUtilLibrary.php
rename to app/Libraries/MyUtilLibrary.php
index b3c8bd6..8a30681 100644
--- a/app/Libraries/MyUtil/MyUtilLibrary.php
+++ b/app/Libraries/MyUtilLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libraries\MyUtil;
+namespace App\Libraries;
 
 use App\Libraries\CommonLibrary;
 
diff --git a/app/Traits/FileTrait.php b/app/Traits/FileTrait.php
index 4839380..5f3ba34 100644
--- a/app/Traits/FileTrait.php
+++ b/app/Traits/FileTrait.php
@@ -35,10 +35,11 @@ trait FileTrait
     {
         // 디렉토리에서 파일 목록 가져오기
         $files = [];
-        foreach (scandir($path) as $file) {
+        foreach (scandir($path) as $file_name) {
             // 확장자가 이미지 형식인지 확인
-            if ($this->isFileType($path, $file, $type)) {
-                $files[] = $file;
+            $file_ext = pathinfo($path . DIRECTORY_SEPARATOR . $file_name, PATHINFO_EXTENSION);
+            if ($this->isFileType($file_ext, $type)) {
+                $files[] = $file_name;
             }
         }
         return $files;