fix

Author: hoothin

Easy offline/Easy offline.user.js

@@ -7,7 +7,7 @@
 // @description:zh-TW 一鍵自動將磁鏈、bt種子或其他下載資源離綫下載至網槃
 // @namespace    http://tampermonkey.net/
 // @require      http://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js
-// @version      1.0.37
+// @version      1.0.38
 // @author       Hoothin
 // @mail         rixixi@gmail.com
 // @include      http*://*/*
@@ -261,8 +261,8 @@
     var b32 = {'a':'00000','b':'00001','c':'00010','d':'00011','e':'00100','f':'00101','g':'00110','h':'00111','i':'01000','j':'01001','k':'01010','l':'01011','m':'01100','n':'01101','o':'01110','p':'01111','q':'10000','r':'10001','s':'10010','t':'10011','u':'10100','v':'10101','w':'10110','x':'10111','y':'11000','z':'11001','2':'11010','3':'11011','4':'11100','5':'11101','6':'11110','7':'11111'};
     var b16 = {'0000':'0','0001':'1','0010':'2','0011':'3','0100':'4','0101':'5','0110':'6','0111':'7','1000':'8','1001':'9','1010':'a','1011':'b','1100':'c','1101':'d','1110':'e','1111':'f'};
     function base32ToHex(str){
-        if(str.length % 8 !== 0){
-            return null;
+        if(str.length % 8 !== 0 || /[0189].test(str)/){
+            return str;
         }
         str = str.toLowerCase();
         var bin =  "", returnStr = "", i;

HacgGodTurn/HacgGodTurn.user.js

@@ -49,11 +49,11 @@
 // @include     http*://htai.*
 // @include     http*://gmgard.com/*
 // @include     http*://*.gmgard.com/*
-// @version     3.20.49
+// @version     3.20.50
 // @grant       GM_notification
 // @grant       GM_xmlhttpRequest
 // @run-at      document-end
-// @require     https://greasyfork.org/scripts/23522/code/od.js?version=159126
+// @require     https://greasyfork.org/scripts/23522/code/od.js?version=159140
 // @require     https://cdn.jsdelivr.net/crypto-js/3.1.2/components/core-min.js
 // @require     https://cdn.jsdelivr.net/crypto-js/3.1.2/rollups/aes.js
 // @license     MIT License
@@ -191,7 +191,7 @@
             },
             {
                 name:"acgzone",
-                url:"http://www.uraban.me/",
+                url:"http://www.uraban.me/wp/",
                 regex:/acgzone\.org|uraban\.me/,
                 contentArea:'article'
             },
@@ -717,30 +717,41 @@
         };
         var oD_text=document.createElement("input");
         oD_text.type="text";
-        oD_text.style.cssText="width:168px;height:33px;position:relative;margin-top: 0px;padding: 0px;";
-        oD_text.placeholder="输入hash值";
+        oD_text.style.cssText="width:168px;height:33px;position:relative;margin-top:0px;padding:0px;box-sizing:border-box;";
+        oD_text.placeholder="输入hash值、网盘或下载地址";
         oD_text.title='将自动添加"magnet:?xt=urn:btih:"并去除非法字符';
         var oD_button=document.createElement("button");
         oD_button.type="button";
         oD_button.textContent="开车";
         oD_button.style.cssText="padding:4px 0;position: absolute;top:-1px;right:0px;width:40px;height:35px";
         oD_button.onclick=function (){
-            var oD_hash=oD_text.value.replace(/(\[.*\])|[\W_]/g,"");
+            var oD_hash=oD_text.value;
             if(oD_hash===""){
-                alert("请输入hash值");
-                return;
-            }else if(!regObj.btih.test(oD_hash)){
-                alert("hash值格式错误");
-                return;
+                alert("请输入hash值、网盘或下载地址");
+            }else if(/\b1[0-9a-z]{6,7}/i.test(oD_hash)){
+                var panMatch=oD_hash.match(/\b1[0-9a-z]{6,7}/i);
+                var ecode=oD_hash.trim(),url="https://pan.baidu.com/s/"+panMatch;
+                ecode=simpleRule.test(ecode)?ecode.match(simpleRule)[1]:codeRule.test(ecode)?ecode.match(codeRule)[1]:"";
+                if(ecode)url+="#"+ecode;
+                window.open(url);
+            }else if(/^\s*(https|ftp)?:\/\//.test(oD_hash)){
+                var url=oD_hash.replace(/[^a-z0-9:\/%\?&\._\-\+\*]/gi,"");
+                window.open(url);
+            }else{
+                oD_hash=oD_hash.replace(/(\[.*\])|[\W_]/g,"");
+                if(!regObj.btih.test(oD_hash)){
+                    alert("hash值格式错误");
+                }else{
+                    oD_link.href="magnet:?xt=urn:btih:"+oD_hash;
+                    oD_link.textContent="磁链";
+                    oD_link2.href="http://www.torrent.org.cn/Home/torrent/download.html?hash="+oD_hash;
+                    oD_link2.textContent="种子";
+                    oD_link2.style.cssText="margin-left:20px";
+                    oD_link3.href="https://btso.pw/magnet/detail/hash/"+oD_hash;
+                    oD_link3.textContent="详情";
+                    oD_link3.style.cssText="margin-left:20px";
+                }
             }
-            oD_link.href="magnet:?xt=urn:btih:"+oD_hash;
-            oD_link.textContent="磁链";
-            oD_link2.href="http://www.torrent.org.cn/Home/torrent/download.html?hash="+oD_hash;
-            oD_link2.textContent="种子";
-            oD_link2.style.cssText="margin-left:20px";
-            oD_link3.href="https://btso.pw/magnet/detail/hash/"+oD_hash;
-            oD_link3.textContent="详情";
-            oD_link3.style.cssText="margin-left:20px";
         };
         var oD_link=document.createElement("a");
         var oD_link2=document.createElement("a");