From f495694fa625f94c1f8e8bc17fe716fc4a7e6587 Mon Sep 17 00:00:00 2001
From: opteroncx <opteroncx@gmail.com>
Date: Thu, 21 Feb 2019 13:48:48 +0800
Subject: [PATCH 1/3] update

---
 package-lock.json | 41 ++++++++++++++++++++++++++++++-----------
 update_log.txt    |  5 +++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9873cf4..5042603 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1921,7 +1921,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1942,12 +1943,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1962,17 +1965,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2089,7 +2095,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2101,6 +2108,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2115,6 +2123,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2122,12 +2131,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2146,6 +2157,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2226,7 +2238,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2238,6 +2251,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2323,7 +2337,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2359,6 +2374,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2378,6 +2394,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2421,12 +2438,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/update_log.txt b/update_log.txt
index 719334c..39b37a3 100644
--- a/update_log.txt
+++ b/update_log.txt
@@ -1,3 +1,8 @@
+==========ver4.3.1============
+slomo现在自动设置batchSize
+系统信息增加cuda和cudnn版本
+简化保存按钮样式
+修正页面若干文字错误
 ==========ver4.2============
 更换快速放大模型
 chcp方式支持非ASCII程序目录

From 72df452babd81053b77aa597346ff465f09ec4f0 Mon Sep 17 00:00:00 2001
From: opteroncx <opteroncx@gmail.com>
Date: Thu, 21 Feb 2019 22:26:13 +0800
Subject: [PATCH 2/3] update 4.3.1

---
 static/lock.html        | 3 ++-
 templates/about.html    | 1 +
 templates/batch.html    | 1 +
 templates/dehaze.html   | 1 +
 templates/document.html | 1 +
 templates/ednoise.html  | 1 +
 templates/gallery.html  | 1 +
 templates/index.html    | 1 +
 templates/system.html   | 1 +
 templates/video.html    | 5 +++--
 update_log.txt          | 3 ++-
 11 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/static/lock.html b/static/lock.html
index bd0ec17..4abf05a 100644
--- a/static/lock.html
+++ b/static/lock.html
@@ -15,7 +15,8 @@
       <br>
     </div>
   </div>
-  <script src="js/8a1c153964d877473620.js"></script>
+  <script src="js/820e101a70e1b9abba8a.js"></script>
+  <script src="js/388b73eab48b78bfd1d0.js"></script>
   <script src="js/progress.js"></script>
   <script>
     $(document).ready(_ => {
diff --git a/templates/about.html b/templates/about.html
index ff13fef..54ad447 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -113,6 +113,7 @@ <h3 class="agileits-title">赞助者</h3>
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/about.js"></script>
 
 </body>
diff --git a/templates/batch.html b/templates/batch.html
index f398c5a..9b4cb1c 100644
--- a/templates/batch.html
+++ b/templates/batch.html
@@ -124,6 +124,7 @@ <h2 class="agileits-title">批量放大</h2>
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/progress.js"></script>
 	<script>
 		$(document).ready(_ => window.app.setup({
diff --git a/templates/dehaze.html b/templates/dehaze.html
index 45f7de8..387ed97 100644
--- a/templates/dehaze.html
+++ b/templates/dehaze.html
@@ -108,6 +108,7 @@ <h2 class="agileits-title">去雾</h2>
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/app.js"></script>
 	<script>
 		$(document).ready(_ => {
diff --git a/templates/document.html b/templates/document.html
index 1e7b378..05afd73 100644
--- a/templates/document.html
+++ b/templates/document.html
@@ -45,6 +45,7 @@ <h4>Moe Photo Image Toolbox
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/app.js"></script>
 </body>
 
diff --git a/templates/ednoise.html b/templates/ednoise.html
index 1358dc1..647e706 100644
--- a/templates/ednoise.html
+++ b/templates/ednoise.html
@@ -108,6 +108,7 @@ <h2 class="agileits-title">强力降噪</h2>
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/app.js"></script>
 	<script>
 		$(document).ready(_ => {
diff --git a/templates/gallery.html b/templates/gallery.html
index 0bd0f33..48e333f 100644
--- a/templates/gallery.html
+++ b/templates/gallery.html
@@ -37,6 +37,7 @@ <h3 class="agileits-title">Gallery相册</h3>
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/app.js"></script>
 	<script>
 		$(_ => $('.w3gallery-grids a').simpleLightbox({
diff --git a/templates/index.html b/templates/index.html
index e4c2124..70a82a5 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -264,6 +264,7 @@ <h2 class="agileits-title">开始吧</h2>
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/progress.js"></script>
 	<script>
 		$(document).ready(function () {
diff --git a/templates/system.html b/templates/system.html
index 3c72d88..79bf293 100644
--- a/templates/system.html
+++ b/templates/system.html
@@ -74,6 +74,7 @@ <h4>Moe Photo Image Toolbox
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/progress.js"></script>
 	<script>
 		$(document).ready(_ => {
diff --git a/templates/video.html b/templates/video.html
index 01e6b90..eb0f575 100644
--- a/templates/video.html
+++ b/templates/video.html
@@ -27,8 +27,8 @@
 			<div class="container">
 				<br>
 				<br>
-				<h2 class="agileits-title">视频放大</h2>
-				<p class="pagile-text">选择一段需要放大的视频！运行完毕请点击保存</p>
+				<h2 class="agileits-title">AI视频</h2>
+				<p class="pagile-text">选择一段需要放大/插帧或慢动作处理的视频！运行完毕请点击保存</p>
 			</div>
 		</div>
 		<!-- //features -->
@@ -154,6 +154,7 @@ <h2 class="agileits-title">视频放大</h2>
 	<!-- //footer end here -->
 	<!-- js -->
 	<script src="{{vendorsJs}}"></script>
+	<script src="{{commonJs}}"></script>
 	<script src="static/js/progress.js"></script>
 	<script>
 		$(document).ready(_ => {
diff --git a/update_log.txt b/update_log.txt
index 39b37a3..46d820d 100644
--- a/update_log.txt
+++ b/update_log.txt
@@ -2,7 +2,8 @@
 slomo现在自动设置batchSize
 系统信息增加cuda和cudnn版本
 简化保存按钮样式
-修正页面若干文字错误
+修正页面若干文字错误，美化图标
+视频放大栏目改为AI视频
 ==========ver4.2============
 更换快速放大模型
 chcp方式支持非ASCII程序目录

From 0ac1910413582ceaee5db803c3b70d7d75c81f53 Mon Sep 17 00:00:00 2001
From: opteroncx <opteroncx@gmail.com>
Date: Thu, 28 Feb 2019 20:09:21 +0800
Subject: [PATCH 3/3] 4.4.2 build fix

---
 setup.py       | 4 +++-
 update_log.txt | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e6738b6..dd5aa65 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,8 @@
         './pyc/mt_download.pyc',
         './pyc/slomo.pyc',
         './pyc/runSlomo.pyc',
+        './pyc/MoeNet_lite2.pyc',
+        './pyc/logger.pyc',
         './templates',
         './static',
         './model',
@@ -49,7 +51,7 @@
         ]
 
 build_exe_options = {
-        'packages': ['tkinter', 'scipy', 'asyncio', 'numpy', 'torch', 'gevent','flask','torchvision'], 
+        'packages': ['tkinter', 'asyncio', 'numpy', 'torch', 'gevent','flask','torchvision','logging'], 
         'includes': ['numpy.core._methods','jinja2','jinja2.ext','asyncio.compat'],
         'include_files': ifiles,
         'bin_excludes': efiles}
diff --git a/update_log.txt b/update_log.txt
index 46d820d..fba6815 100644
--- a/update_log.txt
+++ b/update_log.txt
@@ -1,3 +1,9 @@
+==========ver4.4.2============
+集成4倍快速放大模型
+系统信息页面增加获取日志功能，worker进程日志同时写入.user/log.txt
+后台支持缩放功能，使用PyTorch的Bilinear interpolate
+增加备用的nvml.dll
+统一后台任务接口
 ==========ver4.3.1============
 slomo现在自动设置batchSize
 系统信息增加cuda和cudnn版本