Fix issue: coll image response 404 will stop all this program.

Author: qwqcode

LICENSE

@@ -33,7 +33,7 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 [assembly: NeutralResourcesLanguage("zh-Hans")]
 

Nacollector/Properties/AssemblyInfo.cs

@@ -1,5 +1,5 @@
 /**
- * Created by Zneia on 2017/7/15.
+ * Created by Zneiat on 2017/7/15.
  */
 
 /**
@@ -1616,25 +1616,29 @@ window.setting = {
                 AppLayer.notify.success('日志文件已清理');
             });
         });
-        itemAt(groupMaintenance).btnBlock('检查更新', function () {
-            AppUpdate.check(false);
+        var updateBtn = itemAt(groupMaintenance).btnBlock('检查更新', function () {
+            updateBtn.text("正在检查更新...");
+            AppUpdate.check(false, function () {
+                updateBtn.text("检查更新");
+            });
         });
-
         var groupAbout = group('about', '关于');
         var infoAppVersion = itemAt(groupAbout).infoShow('版本号', '').find('.value');
         AppAction.getVersion().then(function (version) {
             infoAppVersion.text(version);
         });
-        itemAt(groupAbout).infoShow('作者', 'ZNEIAT');
-        itemAt(groupAbout).infoShow('Email', '1149527164@qq.com');
-        itemAt(groupAbout).infoShow('Blog', '<a href="http://www.qwqaq.com" target="_blank">http://www.qwqaq.com</a>');
-        itemAt(groupAbout).infoShow('GitHub', '<a href="https://github.com/Zneiat" target="_blank">https://github.com/Zneiat</a>');
+        itemAt(groupAbout).infoShow('作者', '<a href="https://github.com/Zneiat" target="_blank">ZNEIAT</a>');
+        itemAt(groupAbout).infoShow('联系', '1149527164@qq.com');
+        itemAt(groupAbout).infoShow('博客', '<a href="http://www.qwqaq.com" target="_blank">http://www.qwqaq.com</a>');
+        itemAt(groupAbout).infoShow('GitHub', '<a href="https://github.com/Zneiat/Nacollector" target="_blank">Zneiat/Nacollector</a>');
+        itemAt(groupAbout).infoShow('', '<a href="https://github.com/Zneiat/Nacollector/blob/master/LICENSE" target="_blank">未经允许程序和衍生品不得用于商业用途，侵权必究</a>');
+        itemAt(groupAbout).infoShow('', '<a href="https://github.com/Zneiat/Nacollector" target="_blank">Nacollector</a> Copyright (C) 2018 <a href="https://github.com/Zneiat" target="_blank">Zneiat</a>');
     }
 };
 
 // 升级检测
 window.AppUpdate = {
-    check: function (atDocumentReady) {
+    check: function (atDocumentReady, onFinish) {
         atDocumentReady = atDocumentReady || false;
         var ajaxOpt = {
             type: 'GET',
@@ -1644,6 +1648,7 @@ window.AppUpdate = {
             beforeSend: function() {}
         };
         ajaxOpt.success = function (json) {
+            !!onFinish ? onFinish(json) : null;
             var UpdateVersion = json['latest'] || null;
             if (!!UpdateVersion && UpdateVersion !== AppAction.version) {
                 // 有更新

Nacollector/Resources/html_res/assets/app.js

@@ -325,8 +325,15 @@ private void DownloadAllImgAndPack()
                     // http://www.cnblogs.com/doforfuture/p/6293926.html
                     ThreadPool.QueueUserWorkItem(m =>
                     {
-                        Utils.DownloadImgByUrl(imgSrc, downloadTempPath, imgType + "_" + number.ToString());
-                        LogSuccess($"下载完毕 {imgSrcUrl}");
+                        string errorMsg = null;
+                        try
+                        {
+                            Utils.DownloadImgByUrl(imgSrc, downloadTempPath, imgType + "_" + number.ToString());
+                        } catch (Exception e) { errorMsg = e.Message; }
+                        if (errorMsg == null)
+                            LogSuccess($"下载完毕 {imgSrcUrl}");
+                        else
+                            LogWarning($"下载错误 已忽略 {imgSrcUrl} {errorMsg}");
                         doneTotal++;
                     });
                     imgIndex++;

Nacollector/Spiders/Business/CollItemDescImg.cs

@@ -1,32 +1,57 @@
 # Nacollector
 
-------
+<p align="center"><img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/NacollectorLogo.png"></p>
 
-Nothing... Just C# Web App....
+Nacollector 是一个实用的电商工具箱，或者说是一个卖家工具箱、淘宝卖家工具箱、天猫卖家工具箱...... #(滑稽)
 
-请勿用于商业用途！谢谢配合！
+[Nacollector 能做什么？](https://github.com/Zneiat/Nacollector/wiki/What-you-can-do-with-Nacollector)
 
-------
+> 本项目使用 GPL3.0 开源协议，未经允许代码和衍生品不得用于商业用途，侵权必究
 
-## Screenshot
+#### Features
+- Material Design
+- WEB 界面（使用 [CefSharp](https://github.com/cefsharp/CefSharp)）
+- 实时采集日志
+- 多任务管理器
+- 下载内容管理器
+- Cookie 获取器（可手动导入 Cookie）
+- 多线程异步采集
+- 使用网络代理
+- 在线更新
+- And More
 
-![20170817173257](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173257.png)
+#### Requirements
+- [NET](http://www.php.net/) >= 4.6.2
 
-![20170817173349](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173349.png)
-
-![20170817173412](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173412.png)
-
-![20170817173505](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173505.png)
-
-![20170817173516](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173516.png)
-
-![20170817173551](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173551.png)
-
-![20170817173613](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173613.png)
-
-![20170817173913](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/20170817173913.gif)
-
-![201707253](https://raw.githubusercontent.com/Zneiat/Nacollector/master/screenshots/201707253.gif)
+#### Using
+- [CefSharp](https://github.com/cefsharp/CefSharp)
+- [CsQuery](https://github.com/jamietre/CsQuery)
+- Selenium.WebDriver
+- And More
 
 ## License
-Copyright (c) 2017 [Zneiat](http://www.qwqaq.com "Title")
+[Nacollector](https://github.com/Zneiat/Nacollector) Copyright (C) 2018 [Zneiat](http://www.qwqaq.com "Author Blog")
+
+## Author
+作者：[ZNEIAT](https://github.com/Zneiat)
+
+E-mail: 1149527164@qq.com
+
+## Screenshots
+<p align="center">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/home.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/terminal.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/terminal1.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/terminal2.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/terminal3.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/terminal4.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/terminal5.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/terminal6.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/action.gif">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/cookie_getter.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/tasks.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/downloading.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/downloading1.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/settings.png">
+<img src="https://raw.githubusercontent.com/Zneiat/Nacollector/master/docs/screenshots/panel.gif">
+</p>