From bad5a3c0ef35df50d2edd07ade75a25a694a70f4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 12 May 2018 06:04:06 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EC=9E=A5=20=EB=A7=88=EC=A7=80?=
 =?UTF-8?q?=EB=A7=89=EC=97=90=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
 =?UTF-8?q?=ED=95=9C=20git=20tree-ish=20path=EB=A5=BC=20=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_install/sql/common_schema.sql          |  1 -
 i_entrance/j_server_get_admin_status.php |  5 ++++-
 j_updateServer.php                       | 11 +++++------
 js/admin_server.js                       |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/f_install/sql/common_schema.sql b/f_install/sql/common_schema.sql
index fd6f2100..3b12a0b6 100644
--- a/f_install/sql/common_schema.sql
+++ b/f_install/sql/common_schema.sql
@@ -2,7 +2,6 @@
 DROP TABLE IF EXISTS `system`;
 DROP TABLE IF EXISTS `member`;
 DROP TABLE IF EXISTS `member_log`;
-DROP TABLE IF EXISTS `config`;
 
 -- 시스템 테이블
 -- TODO:장기적으로는 key-value(json) storage 형태로 바꾸는게 나을 듯.
diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php
index fa8cde7f..71fc2133 100644
--- a/i_entrance/j_server_get_admin_status.php
+++ b/i_entrance/j_server_get_admin_status.php
@@ -16,6 +16,8 @@ $result = [];
 
 $server = [];
 
+$storage = new \sammo\KVStorage(RootDB::db(), 'git_path');
+$serverGitPath = $storage->getAll();
 
 $rootServer = Util::array_last(AppConf::getList())->getShortName();
 
@@ -74,7 +76,8 @@ foreach (AppConf::getList() as $setting) {
         'name' => $serverDir,
         'korName' => $serverKorName,
         'color' => $serverColor,
-        'isRoot' => $serverDir == $rootServer
+        'isRoot' => $serverDir == $rootServer,
+        'lastGitPath' => ($serverGitPath[$serverDir][0])??'origin/master'
     ];
     $server[] = $state;
 }  
diff --git a/j_updateServer.php b/j_updateServer.php
index 5d483b09..f0c23cd9 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -29,6 +29,7 @@ if($session->userGrade < 5){
 $request = $_POST + $_GET;
 
 $rootDB = RootDB::db();
+$storage = new \sammo\KVStorage($rootDB, 'git_path');
 $tmpFile = 'd_log/arc.zip';
 
 $v = new Validator($request);
@@ -48,7 +49,7 @@ $target = Util::getReq('target');
 
 $server = basename($request['server']);
 if($session->userGrade <= 5 || !$target){
-    $target = Json::decode($rootDB->queryFirstField('SELECT `key`=%s FROM `config`', "git_path_$server"));
+    $target = $storage->$server;
     if($target){
         $target = $target[0];
     }
@@ -118,6 +119,8 @@ if($server == $baseServerName){
         ], true
     );
 
+    $storage->$server = [null, $version];
+
     Json::die([
         'server'=>$server,
         'result'=>true,
@@ -161,11 +164,7 @@ $result = Util::generateFileUsingSimpleTemplate(
     ], true
 );
 
-$rootDB->insertUpdate('config', [
-    "key" => "git_path_$server",
-    "value" =>Json::encode([$target, $version])
-]);
-
+$storage->$server = [$target, $version];
 //AppConf::getList()[$server]->closeServer();
 
 Json::die([
diff --git a/js/admin_server.js b/js/admin_server.js
index bd157e95..79ff8e1d 100644
--- a/js/admin_server.js
+++ b/js/admin_server.js
@@ -1,6 +1,6 @@
 
 var serverAdminTemplate = '\
-<tr class="bg0" data-server_name="<%name%>" data-is_root="<%isRoot%>">\
+<tr class="bg0" data-server_name="<%name%>" data-is_root="<%isRoot%>" data-git-path="<%lastGitPath%>">\
     <th style="color:<%color%>;"><%korName%>(<%name%>)</th>\
     <td><%status%></td>\
     <td><%version%></td>\
@@ -20,7 +20,7 @@ function serverUpdate(caller){
     var server = $tr.data('server_name');
     var isRoot = $tr.data('is_root');
 
-    var target = 'origin/master';
+    var target = $tr.data('gitPath');
 
     if(typeof isRoot !== 'boolean'){
         isRoot = (isRoot != 'false');