Merge branch 'master' of https://github.com/moecube/srvpro

config.json

@@ -106,6 +106,7 @@
       "db_path": "../ygopro-pre-data/unofficial/",
       "html_img_rel_path": "pre/pics/",
       "html_img_thumbnail": "thumbnail/",
+      "html_img_thumbnail_suffix": "!thumb",
       "cdn": {
         "enabled": false,
         "exe": "upx",

ygopro-pre.js

@@ -58,7 +58,7 @@ var loadDb = function(db_file) {
             
             var cardHTML="<tr>";
             
-            cardHTML+='<td><a href="'+ config.html_img_rel_path + result.id +'.jpg" target="_blank"><img src="'+config.html_img_rel_path+config.html_img_thumbnail+ result.id +'.jpg" alt="'+ result.name +'"></a></td>';
+            cardHTML+='<td><a href="'+ config.html_img_rel_path + result.id +'.jpg" target="_blank"><img src="'+config.html_img_rel_path+config.html_img_thumbnail+ result.id +'.jpg'+ config.html_img_thumbnail_suffix +'" alt="'+ result.name +'"></a></td>';
             cardHTML+='<td>'+ result.name +'</td>';
             
             var cardText="";
@@ -342,9 +342,11 @@ var packDatas = function () {
     }
     execSync('cp -r "' + config.db_path +'expansions" "'+ config.db_path +'cdb"');
     execSync('cp -r "' + config.db_path +'script" "'+ config.db_path +'expansions/script"');
+    execSync('cp -r "' + config.db_path +'field" "'+ config.db_path +'pics/field"');
     execSync('cp -r "' + config.db_path +'pics" "'+ config.db_path +'expansions/pics"');
-    execSync('cp -r "' + config.db_path +'pics/field" "'+ config.db_path +'picture/field"');
-    var proc = spawn("7za", ["a", "-x!*.zip", "-x!mobile.cdb", "-x!cdb", "-x!script", "-x!pics", "-x!expansions/pics/thumbnail", "-x!picture", "ygosrv233-pre.zip", "*"], { cwd: config.db_path, env: process.env });
+    execSync('cp -r "' + config.db_path +'picn" "'+ config.db_path +'picture/card"');
+    execSync('cp -r "' + config.db_path +'field" "'+ config.db_path +'picture/field"');
+    var proc = spawn("7za", ["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md", "-x!mobile.cdb", "-x!cdb", "-x!picn", "-x!field", "-x!script", "-x!pics", "-x!expansions/pics/thumbnail", "-x!picture", "ygosrv233-pre.zip", "*"], { cwd: config.db_path, env: process.env });
     proc.stdout.setEncoding('utf8');
     proc.stdout.on('data', function(data) {
         //sendResponse("7z: "+data);
@@ -355,10 +357,11 @@ var packDatas = function () {
     });
     proc.on('close', function (code) {
         execSync('mv -f "' + config.db_path + 'ygosrv233-pre.zip" "' + file_path + '"');
-        execSync('rm -rf "' + config.db_path +'expansions/script" "'+ config.db_path +'expansions/pics"');
+        execSync('rm -rf "' + config.db_path +'expansions/script"');
+        execSync('rm -rf "' + config.db_path +'expansions/pics"');
         sendResponse("电脑更新包打包完成。");
     });
-    var proc2 = spawn("7za", ["a", "-x!*.zip", "-x!expansions/pics", "-x!expansions/script", "-x!cdb", "-x!pics/thumbnail", "-x!picture", "ygosrv233-pre-mobile.zip", "*"], { cwd: config.db_path, env: process.env });
+    var proc2 = spawn("7za", ["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md", "-x!expansions/pics", "-x!expansions/script", "-x!cdb", "-x!picn", "-x!field", "-x!pics/thumbnail", "-x!picture", "ygosrv233-pre-mobile.zip", "*"], { cwd: config.db_path, env: process.env });
     proc2.stdout.setEncoding('utf8');
     proc2.stdout.on('data', function(data) {
         //sendResponse("7z: "+data);
@@ -369,9 +372,10 @@ var packDatas = function () {
     });
     proc2.on('close', function (code) {
         execSync('mv -f "' + config.db_path +'ygosrv233-pre-mobile.zip" "'+ file_path +'"');
+        execSync('rm -rf "' + config.db_path +'pics/field"');
         sendResponse("手机更新包打包完成。");
     });
-    var proc3 = spawn("7za", ["a", "-x!*.zip", "-x!expansions", "-x!pics", "ygosrv233-pre-2.zip", "*"], { cwd: config.db_path, env: process.env });
+    var proc3 = spawn("7za", ["a", "-x!*.zip", "-x!.git", "-x!LICENSE", "-x!README.md", "-x!expansions", "-x!pics", "-x!picn", "-x!field", "ygosrv233-pre-2.zip", "*"], { cwd: config.db_path, env: process.env });
     proc3.stdout.setEncoding('utf8');
     proc3.stdout.on('data', function(data) {
         //sendResponse("7z: "+data);
@@ -383,6 +387,7 @@ var packDatas = function () {
     proc3.on('close', function (code) {
         execSync('mv -f "' + config.db_path + 'ygosrv233-pre-2.zip" "' + file_path + '"');
         execSync('rm -rf "' + config.db_path +'cdb"');
+        execSync('rm -rf "' + config.db_path +'picture/card"');
         execSync('rm -rf "' + config.db_path +'picture/field"');
         sendResponse("PRO2更新包打包完成。");
     });