优化功能&修复163图片问题

Author: CodFrm

build/cxmooc-tools/manifest.json

@@ -8,12 +8,6 @@
         "48": "img/logo.png",
         "128": "img/logo.png"
     },
-    "applications": {
-        "gecko": {
-            "id": "love@xloli.top",
-            "strict_min_version": "42.0"
-        }
-    },
     "browser_action": {
         "default_icon": "img/logo.png",
         "default_title": "超星慕课小工具",
@@ -53,6 +47,7 @@
     "permissions": [
         "tabs",
         "storage",
+        "webNavigation",
         "<all_urls>"
     ],
     "web_accessible_resources": [

src/background.ts

@@ -23,6 +23,17 @@ class background implements Launcher {
         this.update();
         this.setDefaultConfig();
         this.injectedScript();
+        this.event();
+    }
+
+    protected event() {
+        chrome.runtime.onInstalled.addListener((details) => {
+            if (details.reason == "install") {
+                chrome.tabs.create({ url: "https://cx.icodef.com/" });
+            } else if (details.reason == "update") {
+                chrome.tabs.create({ url: "https://github.com/CodFrm/cxmooc-tools/releases" });
+            }
+        });
     }
 
     protected setDefaultConfig() {
@@ -78,13 +89,6 @@ class background implements Launcher {
                 }
                 this.source = this.dealScript(source, version);
             });
-            if (Application.App.debug) {
-                chrome.storage.onChanged.addListener((changes, namespace) => {
-                    if (namespace == "local" && changes["source"] != undefined) {
-                        this.source = this.dealScript(changes["source"].newValue, version);
-                    }
-                });
-            }
         });
     }
 
@@ -99,30 +103,28 @@ class background implements Launcher {
         if (Application.App.debug) {
             return;
         }
-        chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
-            if (changeInfo.status === 'loading' && changeInfo.url == null) {
-                for (let i = 0; i < SystemConfig.match.length; i++) {
-                    let v = SystemConfig.match[i];
-                    v = v.replace(/(\.\?\/)/g, "\\$1");
-                    v = v.replace(/\*/g, ".*?");
-                    let reg = new RegExp(v);
-                    if (reg.test(tab.url)) {
-                        chrome.tabs.executeScript(tabId, {
-                            code: `(function(){
-                                let temp = document.createElement('script');
-                                temp.setAttribute('type', 'text/javascript');
-                                temp.innerHTML = "`+ this.source + `";
-                                temp.className = "injected-js";
-                                document.documentElement.appendChild(temp)
-                            }())`,
-                            allFrames: true,
-                            runAt: "document_start",
-                        });
-                        break;
-                    }
+        chrome.webNavigation.onCommitted.addListener((details) => {
+            for (let i = 0; i < SystemConfig.match.length; i++) {
+                let v = SystemConfig.match[i];
+                v = v.replace(/(\.\?\/)/g, "\\$1");
+                v = v.replace(/\*/g, ".*?");
+                let reg = new RegExp(v);
+                if (reg.test(details.url)) {
+                    chrome.tabs.executeScript(details.tabId, {
+                        frameId: details.frameId,
+                        code: `(function(){
+                            let temp = document.createElement('script');
+                            temp.setAttribute('type', 'text/javascript');
+                            temp.innerHTML = "`+ this.source + `";
+                            temp.className = "injected-js";
+                            document.documentElement.appendChild(temp)
+                        }())`,
+                        runAt: "document_start",
+                    });
+                    break;
                 }
             }
-        });
+        })
     }
 }
 

src/internal/utils/log.ts

@@ -60,7 +60,7 @@ export class PageLog implements Logger {
         this.el = undefined;
         window.addEventListener("load", () => {
             let div = document.createElement("div");
-            div.innerHTML = '小工具通知条(😭丑陋)<button class="close">关闭</button><div class="tools-notice-content">';
+            div.innerHTML = '小工具通知条<button class="close">关闭</button><div class="tools-notice-content">';
             div.className = "tools-logger-panel";
             document.body.appendChild(div);
             this.el = div.querySelector(".tools-notice-content");

src/internal/utils/utils.ts

@@ -285,7 +285,7 @@ export function removeHTML(html: string) {
     html = html.replace(revHtml, '');
     html = html.replace(/(^\s+)|(\s+$)/g, '');
     html = dealSymbol(html);
-    return html.replace(/ /g, ' ').trim();
+    return html.replace(/ /g, ' ').replace(/&/g, '&').trim();
 }
 
 /**

src/mooc/chaoxing/video.ts

@@ -142,7 +142,16 @@ export class VideoFactory implements TaskFactory {
         prev.prepend(startBtn, pass, download, downloadSubtitle);
         // 绑定事件
         startBtn.onclick = () => {
-            this.task.Start();
+            if (startBtn.innerText == '挂机中...') {
+                localStorage["auto"] = false;
+                startBtn.innerText = "开始挂机";
+                Application.App.log.Info("挂机停止了");
+            } else {
+                localStorage["auto"] = true;
+                startBtn.innerText = '挂机中...';
+                Application.App.log.Info("挂机开始了");
+                this.task.Start();
+            }
         };
         pass.onclick = () => {
             if (!protocolPrompt("秒过视频会产生不良记录,是否继续?", "boom_no_prompt")) {

src/mooc/course163/course163.ts

@@ -85,6 +85,7 @@ export class Course163 implements Mooc {
         if (options == undefined) {
             return
         }
+        //TODO:优化,太难看了
         for (let i = 0; i < options.length; i++) {
             let topic = options[i];
             if (topic.type != 1 && topic.type != 2) {
@@ -93,6 +94,9 @@ export class Course163 implements Mooc {
                     tmpAnswer.topic = topic.title;
                     tmpAnswer.type = 4;
                     tmpAnswer.correct = new Array<Option>();
+                    if(!topic.stdAnswer){
+                        continue;
+                    }
                     tmpAnswer.correct.push({
                         option: "一", content: topic.stdAnswer,
                     });
@@ -102,6 +106,9 @@ export class Course163 implements Mooc {
                     tmpAnswer.topic = topic.title;
                     tmpAnswer.type = 3;
                     tmpAnswer.correct = new Array<Option>();
+                    if(!topic.optionDtos){
+                        continue;
+                    }
                     for (let n = 0; n < topic.optionDtos.length; n++) {
                         if (topic.optionDtos[n].answer) {
                             tmpAnswer.correct.push({
@@ -114,6 +121,9 @@ export class Course163 implements Mooc {
                 }
                 continue;
             }
+            if(!topic.optionDtos){
+                continue;
+            }
             let option = new Array<Option>();
             let correct = new Array<Option>();
             let tmpAnswer = new PushAnswer();

src/mooc/course163/question.ts

@@ -84,7 +84,7 @@ class CourseQuestion implements Question {
 
     protected dealImgDomain(content: string): string {
         //移除域名对比,也不知道还有没有花里胡哨的
-        return content.replace(/"https:\/\/(.*?)\//, "\"");
+        return content.replace(/"http(s|):\/\/(.*?)\//, "\"");
     }
 
     public Fill(answer: Answer): TopicStatus {

src/tampermonkey/course163.js

@@ -1,8 +1,8 @@
 // ==UserScript==
-// @name         中国慕课小工具
+// @name         中国大学慕课小工具
 // @namespace    https://github.com/CodFrm/cxmooc-tools
-// @version      2.12
-// @description  一个中国大学慕课刷课工具,火狐,谷歌,油猴支持.自动作业测试题库(੧ᐛ੭挂科模式,启动)
+// @version      2.2.0
+// @description  一个中国大学mooc刷课工具,火狐,谷歌,油猴支持.自动作业测试题库(੧ᐛ੭挂科模式,启动)
 // @author       CodFrm
 // @run-at       document-start
 // @match        *://www.icourse163.org/learn/*

src/views/popup.html

@@ -573,7 +573,7 @@ <h4 class="one_title">
         <h4 class="one_title"><span>其他:</span></h4>
         <ul>
             <li><a class="three_font" href="https://github.com/CodFrm/cxmooc-tools" target="_black">GitHub开源地址</a></li>
-            <li><a class="three_font" href="https://cx-doc.xloli.top" target="_black">使用文档</a></li>
+            <li><a class="three_font" href="https://cx.icodef.com/" target="_black">使用文档</a></li>
             <li><a class="three_font" href="https://github.com/CodFrm/cxmooc-tools/issues"
                     target="_black">Bug/意见/题目反馈地址</a>
             </li>