From ba97bbed7921a4434d92f32c0fcb817da7152d9b Mon Sep 17 00:00:00 2001 From: liukai <659801@qq.com> Date: Tue, 27 Jun 2017 17:13:08 +0800 Subject: [PATCH] fix bug --- safari2aria.safariextension/Info.plist | 6 ++--- safari2aria.safariextension/global.html | 2 +- .../static/js/endscript.js | 2 +- .../static/js/global.14914e243a1c80b781b0.js | 1 + .../static/js/global.2200b9fc6a37aab2770a.js | 1 - .../static/js/manifest.js | 2 +- .../static/js/startscript.js | 2 +- safari2aria.safariextz | Bin 313233 -> 313216 bytes src/js/endscript/index.js | 17 +++++++++++- src/js/startscript/index.js | 25 ------------------ src/pages/global/index.js | 5 ++-- src/public/pageScriptMessage.js | 10 ++++--- 12 files changed, 32 insertions(+), 41 deletions(-) create mode 100644 safari2aria.safariextension/static/js/global.14914e243a1c80b781b0.js delete mode 100644 safari2aria.safariextension/static/js/global.2200b9fc6a37aab2770a.js diff --git a/safari2aria.safariextension/Info.plist b/safari2aria.safariextension/Info.plist index bfc5d75..ba80810 100644 --- a/safari2aria.safariextension/Info.plist +++ b/safari2aria.safariextension/Info.plist @@ -13,9 +13,9 @@ CFBundleInfoDictionaryVersion 1.0 CFBundleShortVersionString - 2.8 + 2.8.1 CFBundleVersion - 2.8 + 2.8.1 Chrome Database Quota @@ -87,7 +87,7 @@ Update From Gallery Update Manifest URL - https://miniers.github.io/safari2aria/update.plist?t=2.8 + https://miniers.github.io/safari2aria/update.plist?t=2.8.1 Website https://github.com/miniers/safari2aria diff --git a/safari2aria.safariextension/global.html b/safari2aria.safariextension/global.html index c652bd9..db2eb99 100644 --- a/safari2aria.safariextension/global.html +++ b/safari2aria.safariextension/global.html @@ -8,5 +8,5 @@
- + diff --git a/safari2aria.safariextension/static/js/endscript.js b/safari2aria.safariextension/static/js/endscript.js index a1a4804..be1d17f 100644 --- a/safari2aria.safariextension/static/js/endscript.js +++ b/safari2aria.safariextension/static/js/endscript.js @@ -1 +1 @@ -webpackJsonp([3],{146:function(e,t,n){"use strict";function o(e,t){var n=0;return new window.Promise(function(o,i){var a=function(e){var a=document.querySelector(e);return a&&t&&"none"==a.style.display?++n>20&&(i(!1),!0):(o(a),!0)},c=setInterval(function(){a(e)&&clearInterval(c)},500)})}function i(e,t){e.value=t;var n=/^magnet|torrent$/.test(e.value);$("#newoffline-dialog").find("span:contains('确定')[class='text']").click(),n&&o("#offlinebtlist-dialog",!0).then(function(e){"文件名"==$(".content-title-name").html()&&$("a.checked-all")[0].click(),e.querySelectorAll(".dialog-footer>.g-button")[1].click()});!function e(){o("#offlinelist-dialog",!0).then(function(){i()}),o("#dialog1",!0).then(function(t){var n=t.find(".input-code"),o=void 0;n.focus(),o=setInterval(function(){4==n.val().length&&(clearInterval(o),$("#dialog1").find("span:contains('确定')[class='text']").click(),e())},200)})}()}t.a=function(e){document.querySelector(".g-button[data-button-id=b13]").click(),o("#_disk_id_2").then(function(e){return e.click(),o("#share-offline-link")}).then(function(t){i(t,e)})}},153:function(e,t,n){var o,i,a;!function(n,c){i=[],o=c,void 0!==(a="function"==typeof o?o.apply(t,i):o)&&(e.exports=a)}(0,function(){"use strict";function e(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};return function(){function n(e,t){var o=this;e.style.opacity&&e.style.opacity>.05?e.style.opacity=e.style.opacity-.05:e.style.opacity&&e.style.opacity<=.1?e.parentNode&&(e.parentNode.removeChild(e),t&&t()):e.style.opacity=.9,setTimeout(function(){return n.apply(o,[e,t])},1e3/30)}function o(e,n,i){n=n||{},i=i||"";for(var a in e)if(e.hasOwnProperty(a)){var c=e[a];c&&"object"===(void 0===c?"undefined":t(c))&&!(c instanceof Date||c instanceof RegExp)?o(c,n,i+a+" "):n[i]&&"object"===t(n[i])?n[i][a]=c:(n[i]={},n[i][a]=c)}return n}function i(e){var t=o(e),n=JSON.stringify(t,null,2);return n=n.replace(/"([^"]*)": \{/g,"$1 {").replace(/"([^"]*)"/g,"$1").replace(/(\w*-?\w*): ([\w\d .#]*),?/g,"$1: $2;").replace(/},/g,"}\n").replace(/ &([.:])/g,"$1"),n=n.substr(1,n.lastIndexOf("}")-1)}function a(e){var t=document.head||document.getElementsByTagName("head")[0],n=c("style");n.id="mini-toastr-styles",n.type="text/css",n.styleSheet?n.styleSheet.cssText=e:n.appendChild(document.createTextNode(e)),t.appendChild(n)}function c(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"div";return document.createElement(e)}function s(e,t,n){var o=c(n.icons[t].nodeType),i=n.icons[t].attrs;for(var a in i)i.hasOwnProperty(a)&&o.setAttribute(a,i[a]);e.appendChild(o)}function r(e,t,n){var o=c();o.className=n,o.appendChild(document.createTextNode(t)),e.appendChild(o)}var u,d;if("undefined"==typeof window)return{init:function(){}};var l={error:"error",warn:"warn",success:"success",info:"info"},f={container:"mini-toastr",notification:"mini-toastr__notification",title:"mini-toastr-notification__title",icon:"mini-toastr-notification__icon",message:"mini-toastr-notification__message",error:"-"+l.error,warn:"-"+l.warn,success:"-"+l.success,info:"-"+l.info},p={types:l,animation:n,timeout:3e3,icons:{},appendTarget:document.body,node:c(),style:(d={},e(d,"."+f.container,{position:"fixed","z-index":99999,right:"12px",top:"12px"}),e(d,"."+f.notification,(u={cursor:"pointer",padding:"12px 18px",margin:"0 0 6px 0","background-color":"#000",opacity:.8,color:"#fff","border-radius":"3px","box-shadow":"#3c3b3b 0 0 12px",width:"300px"},e(u,"&."+f.error,{"background-color":"#D5122B"}),e(u,"&."+f.warn,{"background-color":"#F5AA1E"}),e(u,"&."+f.success,{"background-color":"#7AC13E"}),e(u,"&."+f.info,{"background-color":"#4196E1"}),e(u,"&:hover",{opacity:1,"box-shadow":"#000 0 0 12px"}),u)),e(d,"."+f.title,{"font-weight":"500"}),e(d,"."+f.message,{display:"inline-block","vertical-align":"middle",width:"240px",padding:"0 12px"}),d)},m={config:p,showMessage:function(e,t,n,o,i,a){var u={};Object.assign(u,this.config),Object.assign(u,a);var d=c();return d.className=f.notification+" "+f[n],d.onclick=function(){u.animation(d,null)},t&&r(d,t,f.title),u.icons[n]&&s(d,n,u),e&&r(d,e,f.message),u.node.insertBefore(d,u.node.firstChild),setTimeout(function(){return u.animation(d,i)},o||u.timeout),i&&i(),this},init:function(e){var t=this,n={};return Object.assign(n,p),Object.assign(n,e),this.config=n,a(i(n.style)),n.node.id=""+f.container,n.node.className=""+f.container,n.appendTarget.appendChild(n.node),Object.keys(n.types).forEach(function(e){m[n.types[e]]=function(t,o,i,a,c){return this.showMessage(t,o,n.types[e],i,a,c),this}.bind(t)}),this},setIcon:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"i",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];n.class=n.class?n.class+" "+f.icon:f.icon,this.config.icons[e]={nodeType:t,attrs:n}}};return m}()})},157:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(153),i=n.n(o),a=n(146),c=n(36),s=n(37);window.top===window&&function(){function e(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=p.language||navigator.language;return g[n]&&g[n][e]?[g[n][e]," "].join(""):t.notfailback?"":[e," "].join("")}function t(){var e=window.getSelection().toString();return e.match(/^https?/)||e.match(/magnet:/)?e:null}function o(e){var t=null;return"BODY"===e.tagName?t=null:"IMG"===e.tagName&&e.src?t=e.src:e.href?t=e.href:e.parentNode&&(t=o(e.parentNode)),t}function r(t){n.i(s.a)({listeners:[{name:"changeRpc",cb:function(t){i.a.success(e("Success switch the default download service to")+t)}},{name:"currentRpc",cb:function(t){i.a.success(e("The current download service is")+t)}},{name:"showMassage",cb:function(e){i.a[e.action||"success"](e.text,e.title)}},{name:"baiduLixian",cb:function(e){location.href.match(/^https?:\/\/pan\.baidu\.com/)&&n.i(a.a)(e.url)}},{name:"sendToEndScript",cb:function(e){p=e,d(),safari.self.tab.dispatchMessage("documentReady",{cookie:document.cookie})}}]})}function u(e){var n=[o(e.target)||t(),document.location.href,document.cookie];safari.self.tab.setContextMenuEventUserInfo(e,n)}function d(){if(f)return void(p.catchIframe||f.disconnect());p.catchIframe&&(f=new MutationObserver(function(e){e.some(function(e){return!("IFRAME"!==e.target.tagName||"attributes"!==e.type||"src"!==e.attributeName||!n.i(c.a)(e.target.src,p,m))&&(!e.target.src.match(/^https:\/\/127\.0\.0\.1\//)&&(safari.self.tab.dispatchMessage("downloadFromIframe",{url:e.target.src,cookie:document.cookie}),e.target.src="https://127.0.0.1/",!1))})}),f.observe(document.body,{attributes:!0,attributeFilter:["src"],attributeOldValue:!0,characterData:!1,characterDataOldValue:!1,childList:!1,subtree:!0}))}function l(){m.isCommandPressed=!!m[91],m.isShiftPressd=!!m[16],m.isOptionPressd=!!m[18],safari.self.tab.dispatchMessage("keyPress",{keyPressed:m})}var f,p,m={},g={"zh-CN":{"Success switch the default download service to":"成功切换默认下载服务至","The current download service is":"当前下载服务为"}};document.onkeydown=function(e){var t=e.charCode?e.charCode:e.keyCode;m[t]=!0,l()},document.onkeyup=function(e){var t=e.charCode?e.charCode:e.keyCode;delete m[t],l()},window.onblur=function(e){m={},l()},function(){i.a.init({appendTarget:document.body,timeout:5e3}),document.addEventListener("contextmenu",u,!1),r(),l()}()}()},36:function(e,t,n){"use strict";function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(e&&!n[82]&&t.enableTypefiles?!n.isCommandPressed:n.isCommandPressed){if(e.match(/magnet:[^\\"]+/))return!0;var o=e.substr(e.lastIndexOf(".")+1);o=o.toLowerCase();for(var i=t.filetypes?t.filetypes.split(" "):[],a=0;a0&&void 0!==arguments[0]?arguments[0]:{};return new Promise(function(t,n){setTimeout(function(){n("timeout to get config")},1e4),window.extensionMessageListener||safari.self.addEventListener("message",function(e){var o=0;window.extensionMessageListener.forEach(function(n){e.name===n.name&&(n.cb&&n.cb(e.message||{}),t(e.message||{}),o++)}),o||n("no listener"),e.message&&e.message.hasCb&&safari.self.tab.dispatchMessage([e.name,"cb"].join("_"),{cookie:document.cookie})},!1),window.extensionMessageListener=[].concat(window.extensionMessageListener||[]).concat(e.listeners||[]),e.send&&e.send.forEach(function(e){safari.self.tab.dispatchMessage(e.name,e.params)})})}}},[157]); \ No newline at end of file +webpackJsonp([3],{146:function(e,t,n){"use strict";function i(e,t){var n=0;return new window.Promise(function(i,o){var a=function(e){var a=document.querySelector(e);return a&&t&&"none"==a.style.display?++n>20&&(o(!1),!0):(i(a),!0)},c=setInterval(function(){a(e)&&clearInterval(c)},500)})}function o(e,t){e.value=t;var n=/^magnet|torrent$/.test(e.value);$("#newoffline-dialog").find("span:contains('确定')[class='text']").click(),n&&i("#offlinebtlist-dialog",!0).then(function(e){"文件名"==$(".content-title-name").html()&&$("a.checked-all")[0].click(),e.querySelectorAll(".dialog-footer>.g-button")[1].click()});!function e(){i("#offlinelist-dialog",!0).then(function(){o()}),i("#dialog1",!0).then(function(t){var n=t.find(".input-code"),i=void 0;n.focus(),i=setInterval(function(){4==n.val().length&&(clearInterval(i),$("#dialog1").find("span:contains('确定')[class='text']").click(),e())},200)})}()}t.a=function(e){document.querySelector(".g-button[data-button-id=b13]").click(),i("#_disk_id_2").then(function(e){return e.click(),i("#share-offline-link")}).then(function(t){o(t,e)})}},150:function(e,t,n){"use strict";t.a=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return new Promise(function(t,n){setTimeout(function(){n("timeout to get config")},1e4),window.extensionMessageListener||safari.self.addEventListener("message",function(e){var i=0;window.extensionMessageListener.forEach(function(n){e.name===n.name&&(document.hidden&&!n.background||(n.cb&&n.cb(e.message||{}),t(e.message||{}),i++))}),i||n(document.hidden?"in background":"no listener"),e.message&&e.message.hasCb&&safari.self.tab.dispatchMessage([e.name,"cb"].join("_"),{cookie:document.cookie})},!1),window.extensionMessageListener=[].concat(window.extensionMessageListener||[]).concat(e.listeners||[]),e.send&&e.send.forEach(function(e){safari.self.tab.dispatchMessage(e.name,e.params)})})}},153:function(e,t,n){var i,o,a;!function(n,c){o=[],i=c,void 0!==(a="function"==typeof i?i.apply(t,o):i)&&(e.exports=a)}(0,function(){"use strict";function e(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};return function(){function n(e,t){var i=this;e.style.opacity&&e.style.opacity>.05?e.style.opacity=e.style.opacity-.05:e.style.opacity&&e.style.opacity<=.1?e.parentNode&&(e.parentNode.removeChild(e),t&&t()):e.style.opacity=.9,setTimeout(function(){return n.apply(i,[e,t])},1e3/30)}function i(e,n,o){n=n||{},o=o||"";for(var a in e)if(e.hasOwnProperty(a)){var c=e[a];c&&"object"===(void 0===c?"undefined":t(c))&&!(c instanceof Date||c instanceof RegExp)?i(c,n,o+a+" "):n[o]&&"object"===t(n[o])?n[o][a]=c:(n[o]={},n[o][a]=c)}return n}function o(e){var t=i(e),n=JSON.stringify(t,null,2);return n=n.replace(/"([^"]*)": \{/g,"$1 {").replace(/"([^"]*)"/g,"$1").replace(/(\w*-?\w*): ([\w\d .#]*),?/g,"$1: $2;").replace(/},/g,"}\n").replace(/ &([.:])/g,"$1"),n=n.substr(1,n.lastIndexOf("}")-1)}function a(e){var t=document.head||document.getElementsByTagName("head")[0],n=c("style");n.id="mini-toastr-styles",n.type="text/css",n.styleSheet?n.styleSheet.cssText=e:n.appendChild(document.createTextNode(e)),t.appendChild(n)}function c(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"div";return document.createElement(e)}function s(e,t,n){var i=c(n.icons[t].nodeType),o=n.icons[t].attrs;for(var a in o)o.hasOwnProperty(a)&&i.setAttribute(a,o[a]);e.appendChild(i)}function r(e,t,n){var i=c();i.className=n,i.appendChild(document.createTextNode(t)),e.appendChild(i)}var u,d;if("undefined"==typeof window)return{init:function(){}};var l={error:"error",warn:"warn",success:"success",info:"info"},f={container:"mini-toastr",notification:"mini-toastr__notification",title:"mini-toastr-notification__title",icon:"mini-toastr-notification__icon",message:"mini-toastr-notification__message",error:"-"+l.error,warn:"-"+l.warn,success:"-"+l.success,info:"-"+l.info},m={types:l,animation:n,timeout:3e3,icons:{},appendTarget:document.body,node:c(),style:(d={},e(d,"."+f.container,{position:"fixed","z-index":99999,right:"12px",top:"12px"}),e(d,"."+f.notification,(u={cursor:"pointer",padding:"12px 18px",margin:"0 0 6px 0","background-color":"#000",opacity:.8,color:"#fff","border-radius":"3px","box-shadow":"#3c3b3b 0 0 12px",width:"300px"},e(u,"&."+f.error,{"background-color":"#D5122B"}),e(u,"&."+f.warn,{"background-color":"#F5AA1E"}),e(u,"&."+f.success,{"background-color":"#7AC13E"}),e(u,"&."+f.info,{"background-color":"#4196E1"}),e(u,"&:hover",{opacity:1,"box-shadow":"#000 0 0 12px"}),u)),e(d,"."+f.title,{"font-weight":"500"}),e(d,"."+f.message,{display:"inline-block","vertical-align":"middle",width:"240px",padding:"0 12px"}),d)},p={config:m,showMessage:function(e,t,n,i,o,a){var u={};Object.assign(u,this.config),Object.assign(u,a);var d=c();return d.className=f.notification+" "+f[n],d.onclick=function(){u.animation(d,null)},t&&r(d,t,f.title),u.icons[n]&&s(d,n,u),e&&r(d,e,f.message),u.node.insertBefore(d,u.node.firstChild),setTimeout(function(){return u.animation(d,o)},i||u.timeout),o&&o(),this},init:function(e){var t=this,n={};return Object.assign(n,m),Object.assign(n,e),this.config=n,a(o(n.style)),n.node.id=""+f.container,n.node.className=""+f.container,n.appendTarget.appendChild(n.node),Object.keys(n.types).forEach(function(e){p[n.types[e]]=function(t,i,o,a,c){return this.showMessage(t,i,n.types[e],o,a,c),this}.bind(t)}),this},setIcon:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"i",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];n.class=n.class?n.class+" "+f.icon:f.icon,this.config.icons[e]={nodeType:t,attrs:n}}};return p}()})},157:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=n(153),o=n.n(i),a=n(146),c=n(36),s=n(150),r=n(37);window.top===window&&function(){function e(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=g.language||navigator.language;return b[n]&&b[n][e]?[b[n][e]," "].join(""):t.notfailback?"":[e," "].join("")}function t(){var e=window.getSelection().toString();return e.match(/^https?/)||e.match(/magnet:/)?e:null}function i(e){var t=null;return"BODY"===e.tagName?t=null:"IMG"===e.tagName&&e.src?t=e.src:e.href?t=e.href:e.parentNode&&(t=i(e.parentNode)),t}function u(e){console.log("disableBaiduLimit:",e.disableBaiduLimit),window.mDisableBaiduLimit=e.disableBaiduLimit}function d(t){n.i(s.a)({send:[{name:"getConfig"}],listeners:[{name:"changeRpc",cb:function(t){o.a.success(e("Success switch the default download service to")+t)}},{name:"currentRpc",cb:function(t){o.a.success(e("The current download service is")+t)}},{name:"showMassage",cb:function(e){o.a[e.action||"success"](e.text,e.title)}},{name:"baiduLixian",cb:function(e){location.href.match(/^https?:\/\/pan\.baidu\.com/)&&n.i(a.a)(e.url)}},{name:"updateConfig",background:!0,cb:function(e){g=e,f(),safari.self.tab.dispatchMessage("documentReady",{cookie:document.cookie}),location.href.match(/baidu/)&&n.i(r.a)(u,{disableBaiduLimit:g.disableBaiduLimit})}}]})}function l(e){var n=[i(e.target)||t(),document.location.href,document.cookie];safari.self.tab.setContextMenuEventUserInfo(e,n)}function f(){if(p)return void(g.catchIframe||p.disconnect());g.catchIframe&&(p=new MutationObserver(function(e){e.some(function(e){return!("IFRAME"!==e.target.tagName||"attributes"!==e.type||"src"!==e.attributeName||!n.i(c.a)(e.target.src,g,h))&&(!e.target.src.match(/^https:\/\/127\.0\.0\.1\//)&&(safari.self.tab.dispatchMessage("downloadFromIframe",{url:e.target.src,cookie:document.cookie}),e.target.src="https://127.0.0.1/",!1))})}),p.observe(document.body,{attributes:!0,attributeFilter:["src"],attributeOldValue:!0,characterData:!1,characterDataOldValue:!1,childList:!1,subtree:!0}))}function m(){h.isCommandPressed=!!h[91],h.isShiftPressd=!!h[16],h.isOptionPressd=!!h[18],safari.self.tab.dispatchMessage("keyPress",{keyPressed:h})}var p,g,h={},b={"zh-CN":{"Success switch the default download service to":"成功切换默认下载服务至","The current download service is":"当前下载服务为"}};document.onkeydown=function(e){var t=e.charCode?e.charCode:e.keyCode;h[t]=!0,m()},document.onkeyup=function(e){var t=e.charCode?e.charCode:e.keyCode;delete h[t],m()},window.onblur=function(e){h={},m()},function(){o.a.init({appendTarget:document.body,timeout:5e3}),document.addEventListener("contextmenu",l,!1),d(),m()}()}()},36:function(e,t,n){"use strict";function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(e&&!n[82]&&t.enableTypefiles?!n.isCommandPressed:n.isCommandPressed){if(e.match(/magnet:[^\\"]+/))return!0;var i=e.substr(e.lastIndexOf(".")+1);i=i.toLowerCase();for(var o=t.filetypes?t.filetypes.split(" "):[],a=0;a1&&void 0!==arguments[1]?arguments[1]:{},n=D.language||navigator.language;return x()(A,[n,t],e.notfailback?"":[t," "].join(""))}function i(){var t={};D.rpcList.forEach(function(e,n){var o=e.url.match(/^(http|ws)(s)?(?:\:\/\/)(token\:[^@]*)?@?([^\:\/]*)\:?(\d*)(\/[^\/]*)/),i={host:o[4],port:o[5]||6800,secure:!(!o||!o[2]),secret:o[3]?o[3].split(":")[1]:"",path:o[6]||"/jsonrpc"};if(j[e.url])t[e.url]=j[e.url],delete j[e.url];else{var r=new I.Aria2(i);t[e.url]={aria2:r,rpc:e,push:e.push}}e.push&&a(t[e.url],e.name)});for(var e in j){var n=j[e].aria2;n&&n.socket&&1===n.socket.readyState&&j[e].aria2.close()}j=t}function a(t,e){var n=t.aria2;return!(!t.aria2||!t.aria2.socket||1!==n.socket.readyState)||(n.open().then(function(){s(t,e),t.reconnect&&(delete t.reconnect,R.success([o("Successful links to"),e]))}).catch(function(n){x()(safari,"application.activeBrowserWindow.activeTab.url")&&(!t.reconnect&&R.error([o("Make sure the aria2 is running, every 10 seconds will automatically retry")],[e,o("Connection fail")]),t.reconnect=!0),P=P||setInterval(function(){var t=0;S()(j,function(e){t+=a(e)?0:1}),t||clearInterval(P)},1e4)}),!1)}function r(){x()(safari,"extension.popovers[0].contentWindow.tlwin.refreshTaskList")&&safari.extension.popovers[0].contentWindow.tlwin.refreshTaskList()}function s(t,e){var n=t.aria2,i=function(t){r()},a=function(t){r()},s=function(t,e){r(),c(n,t.gid).then(function(t){R.show(e?"error":"success",[t,o("Download"),o(e?"error":"success")])})};n.onDownloadStart=i,n.onDownloadPause=a,n.onDownloadStop=a,n.onDownloadComplete=s,n.onBtDownloadComplete=s,n.onDownloadError=function(t){s(t,!0)}}function c(t,e){return t.tellStatus(e,["bittorrent"]).then(function(n){return t.getFiles(e).then(function(t){return{files:t,bt:n}})}).then(function(t){var e=t.files[0].path,n=e.split("/").pop();return t.bt&&t.bt.info?bt.bittorrent.info.name:n}).catch(function(t){R.error([o("Failed to get task information")])})}function l(t){var e=j[t[0].url],n=!!e&&e.aria2,i=D.enableCookie?"Cookie: "+t[3]:"";n&&t[1]?n.addUri([t[1]],{header:i,timeout:10,"content-disposition-default-utf8":!0,"user-agent":D.userAgent}).then(function(){R.success([o("Successfully added to the"),e.rpc.name,D.enableCookie?"":"(with cookie)"])}).catch(function(t){R.error([o("Fail to Added to the"),e.rpc.name,o("failure",{notfailback:!0}),D.enableCookie?"":"(without cookie)"]),console.log(t)}):R.error(["添加任务失败：没有url或者没有连接aria2"])}function u(t){"showOptions"===t.key&&f()}function f(){safari.application.activeBrowserWindow.openTab().url=safari.extension.baseURI+"options.html"}function d(){D=localStorage.getItem("safari2aria");try{D=JSON.parse(D||"{}")}catch(t){D={defaultRpcIndex:0}}L=D.filetypes?D.filetypes.split(" "):[];for(var t=0;t=0){var n=t.userInfo;n&&n.length&&n[0]||(t.target.disabled=!0)}}function g(t){n.i(C.a)(t.url,D,O)&&(t.preventDefault(),p("getCookie",function(e){l([E[D.defaultRpcIndex],t.url,t.target.url,e.cookie])}))}function w(t){E.forEach(function(e,n){t.contextMenu.appendContextMenuItem(["DownloadWithAria2",n].join("."),[o("Downloaded to"),e.name].join(""))}),D.enableXunleiLixian&&t.contextMenu.appendContextMenuItem("DownloadWithXunleilixian",[o("Import to thunder lixian")].join("")),D.enableBaiduLixian&&t.contextMenu.appendContextMenuItem("DownloadWithBaidulixian",[o("Import to baidu lixian")].join(""))}function y(t){M[t.name]&&M[t.name](t.message,t)}Object.defineProperty(e,"__esModule",{value:!0});var b=n(18),x=n.n(b),k=n(55),S=n.n(k),I=n(54),C=n(36),D={defaultRpcIndex:0},A={"zh-CN":{"Successful links to":"成功链接","Connection fail":"连接失败",Download:"下载",error:"失败","Import to thunder lixian":"导入至迅雷离线","Import to baidu lixian":"导入至百度离线","Downloaded to":"下载至",success:"成功","Successfully added to the":"成功添加至","Added to the":"添加至",failure:"失败","Failed to get task information":"获取任务信息失败","Make sure the aria2 is running, every 10 seconds will automatically retry":"请确认aria2已经运行,每隔10秒将会自动重试"}},O=void 0,L=[],E=[],j={},W={},P=void 0,M={updateSafari2Aria:function(t){localStorage.setItem("safari2aria",JSON.stringify(t)),d()},keyPress:function(t){h(t)},getConfig:function(){p("updateConfig",D)},documentReady:function(){S()(W,function(t){t.action()})},downloadFromIframe:function(t,e){l([E[D.defaultRpcIndex],t.url,e.target.url,t.cookie])}},R={success:function(t,e){R.show("success",t,e)},error:function(t,e){R.show("error",t,e)},show:function(t,e,n){e instanceof Array&&(e=e.join("")),n instanceof Array&&(n=n.join("")),p("showMassage",{action:t||"success",text:e,title:n})}};window.s2a={changeServer:function(t){var e=void 0;S()(E,function(n,o){n.url===t&&(e=o)}),D.defaultRpcIndex=e,y({name:"updateSafari2Aria",message:D})},dispatchMessage:y,openOptions:f,getConfig:function(){return{config:D,aria2Connects:j}}},document.addEventListener("DOMContentLoaded",d),safari.application.addEventListener("message",y,!1),safari.extension.settings.addEventListener("change",u,!1),safari.application.addEventListener("command",m,!1),safari.application.addEventListener("validate",v,!1),safari.application.addEventListener("beforeNavigate",g,!1),safari.application.addEventListener("contextmenu",w,!1)},36:function(t,e,n){"use strict";function o(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(t&&!n[82]&&e.enableTypefiles?!n.isCommandPressed:n.isCommandPressed){if(t.match(/magnet:[^\\"]+/))return!0;var o=t.substr(t.lastIndexOf(".")+1);o=o.toLowerCase();for(var i=e.filetypes?e.filetypes.split(" "):[],a=0;a0&&(o.params=t.params);var i="http"+(this.secure?"s":"")+"://"+this.host+":"+this.port+this.path;fetch(i,{method:"POST",body:JSON.stringify(o),headers:{Accept:"application/json","Content-Type":"application/json"}}).then(function(t){return t.json()}).then(function(t){n._onmessage(t)}).catch(e)},a.prototype.send=function(t){var e=Array.prototype.slice.call(arguments,1),n="function"==typeof e[e.length-1]?e.pop():null;return this.exec(t,e,n)},a.prototype.exec=function(t,e,n){if("string"!=typeof t)throw new TypeError(t+" is not a string");0!==t.indexOf("system.")&&0!==t.indexOf("aria2.")&&(t="aria2."+t);var i={method:t,"json-rpc":"2.0",id:this.lastId++},a=this.secret?["token:"+this.secret]:[];Array.isArray(e)&&("system.multicall"===t?(Array.isArray(e[0])&&e[0].forEach(function(t){t.params||(t.params=[]),t.params=a.concat(t.params)}),a=e):a=a.concat(e)),a.length>0&&(i.params=a),this.onsend(i);var r=this;return this.socket&&1===this.socket.readyState?this.socket.send(JSON.stringify(i)):this.http(i,function(t){r.callbacks[i.id](t),delete r.callbacks[i.id]}),o()(function(t){r.callbacks[i.id]=t},n)},a.prototype._onmessage=function(t){if(this.onmessage(t),void 0!==t.id){var e=this.callbacks[t.id];e&&(t.error?e(t.error):e(null,t.result),delete this.callbacks[t.id])}else if(t.method){var n=t.method.split("aria2.")[1];0===n.indexOf("on")&&"function"==typeof this[n]&&a.notifications.indexOf(n)>-1&&this[n].apply(this,t.params)}},a.prototype.open=function(t){var e="ws"+(this.secure?"s":"")+"://"+this.host+":"+this.port+this.path,n=this.socket=new WebSocket(e),i=this,a=!1;return n.onmessage=function(t){i._onmessage(JSON.parse(t.data))},o()(function(t){n.onopen=function(){a||(t(),a=!0),i.onopen()},n.onclose=function(e){i.onclose(),1006==e.code&&(a||(t(e),a=!0))},n.onerror=function(e){a||(t(e),a=!0)}},t)},a.prototype.close=function(t){var e=this.socket;return o()(function(t){e?(e.addEventListener("close",function(){t()}),e.close()):t()},t)},a.methods=["addUri","addTorrent","addMetalink","remove","forceRemove","pause","pauseAll","forcePause","forcePauseAll","unpause","unpauseAll","tellStatus","getUris","getFiles","getPeers","getServers","tellActive","tellWaiting","tellStopped","changePosition","changeUri","getOption","changeOption","getGlobalOption","changeGlobalOption","getGlobalStat","purgeDownloadResult","removeDownloadResult","getVersion","getSessionInfo","shutdown","forceShutdown","saveSession","system.multicall","system.listMethods","system.listNotifications"],a.notifications=["onDownloadStart","onDownloadPause","onDownloadStop","onDownloadComplete","onDownloadError","onBtDownloadComplete"],a.events=["onopen","onclose","onsend","onmessage"],a.options={secure:!1,host:"localhost",port:6800,secret:"",path:"/jsonrpc"},a.methods.forEach(function(t){var e=t.indexOf(".")>-1?t.split(".")[1]:t;a.prototype[e]=function(){return this.send.apply(this,[t].concat(Array.prototype.slice.call(arguments)))}}),a.notifications.forEach(function(t){a.prototype[t]=function(){}}),a.events.forEach(function(t){a.prototype[t]=function(){}}),n?t.exports=a:e.Aria2=a}(this)}).call(e,n(132)(t))}},[159]); \ No newline at end of file diff --git a/safari2aria.safariextension/static/js/global.2200b9fc6a37aab2770a.js b/safari2aria.safariextension/static/js/global.2200b9fc6a37aab2770a.js deleted file mode 100644 index c16fd87..0000000 --- a/safari2aria.safariextension/static/js/global.2200b9fc6a37aab2770a.js +++ /dev/null @@ -1 +0,0 @@ -webpackJsonp([4],{159:function(t,e,n){"use strict";function o(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=C.language||navigator.language;return x()(A,[n,t],e.notfailback?"":[t," "].join(""))}function i(){var t={};C.rpcList.forEach(function(e,n){var o=e.url.match(/^(http|ws)(s)?(?:\:\/\/)(token\:[^@]*)?@?([^\:\/]*)\:?(\d*)(\/[^\/]*)/),i={host:o[4],port:o[5]||6800,secure:!(!o||!o[2]),secret:o[3]?o[3].split(":")[1]:"",path:o[6]||"/jsonrpc"};if(j[e.url])t[e.url]=j[e.url],delete j[e.url];else{var r=new I.Aria2(i);t[e.url]={aria2:r,rpc:e,push:e.push}}e.push&&a(t[e.url],e.name)});for(var e in j){var n=j[e].aria2;n&&n.socket&&1===n.socket.readyState&&j[e].aria2.close()}j=t}function a(t,e){var n=t.aria2;return!(!t.aria2||!t.aria2.socket||1!==n.socket.readyState)||(n.open().then(function(){s(t,e),t.reconnect&&(delete t.reconnect,R.success([o("Successful links to"),e]))}).catch(function(n){x()(safari,"application.activeBrowserWindow.activeTab.url")&&(!t.reconnect&&R.error([o("Make sure the aria2 is running, every 10 seconds will automatically retry")],[e,o("Connection fail")]),t.reconnect=!0),P=P||setInterval(function(){var t=0;S()(j,function(e){t+=a(e)?0:1}),t||clearInterval(P)},1e4)}),!1)}function r(){x()(safari,"extension.popovers[0].contentWindow.tlwin.refreshTaskList")&&safari.extension.popovers[0].contentWindow.tlwin.refreshTaskList()}function s(t,e){var n=t.aria2,i=function(t){r()},a=function(t){r()},s=function(t,e){r(),c(n,t.gid).then(function(t){R.show(e?"error":"success",[t,o("Download"),o(e?"error":"success")])})};n.onDownloadStart=i,n.onDownloadPause=a,n.onDownloadStop=a,n.onDownloadComplete=s,n.onBtDownloadComplete=s,n.onDownloadError=function(t){s(t,!0)}}function c(t,e){return t.tellStatus(e,["bittorrent"]).then(function(n){return t.getFiles(e).then(function(t){return{files:t,bt:n}})}).then(function(t){var e=t.files[0].path,n=e.split("/").pop();return t.bt&&t.bt.info?bt.bittorrent.info.name:n}).catch(function(t){R.error([o("Failed to get task information")])})}function l(t){var e=j[t[0].url],n=!!e&&e.aria2,i=C.enableCookie?"Cookie: "+t[3]:"";n&&t[1]?n.addUri([t[1]],{header:i,timeout:10,"content-disposition-default-utf8":!0,"user-agent":C.userAgent}).then(function(){R.success([o("Successfully added to the"),e.rpc.name,C.enableCookie?"":"(with cookie)"])}).catch(function(t){R.error([o("Fail to Added to the"),e.rpc.name,o("failure",{notfailback:!0}),C.enableCookie?"":"(without cookie)"]),console.log(t)}):R.error(["添加任务失败：没有url或者没有连接aria2"])}function u(t){"showOptions"===t.key&&f()}function f(){safari.application.activeBrowserWindow.openTab().url=safari.extension.baseURI+"options.html"}function d(){C=localStorage.getItem("safari2aria");try{C=JSON.parse(C||"{}")}catch(t){C={defaultRpcIndex:0}}L=C.filetypes?C.filetypes.split(" "):[];for(var t=0;t=0){var n=t.userInfo;n&&n.length&&n[0]||(t.target.disabled=!0)}}function g(t){n.i(D.a)(t.url,C,O)&&(t.preventDefault(),p("getCookie",function(e){l([E[C.defaultRpcIndex],t.url,t.target.url,e.cookie])}))}function w(t){E.forEach(function(e,n){t.contextMenu.appendContextMenuItem(["DownloadWithAria2",n].join("."),[o("Downloaded to"),e.name].join(""))}),C.enableXunleiLixian&&t.contextMenu.appendContextMenuItem("DownloadWithXunleilixian",[o("Import to thunder lixian")].join("")),C.enableBaiduLixian&&t.contextMenu.appendContextMenuItem("DownloadWithBaidulixian",[o("Import to baidu lixian")].join(""))}function y(t){M[t.name]&&M[t.name](t.message,t)}Object.defineProperty(e,"__esModule",{value:!0});var b=n(18),x=n.n(b),k=n(55),S=n.n(k),I=n(54),D=n(36),C={defaultRpcIndex:0},A={"zh-CN":{"Successful links to":"成功链接","Connection fail":"连接失败",Download:"下载",error:"失败","Import to thunder lixian":"导入至迅雷离线","Import to baidu lixian":"导入至百度离线","Downloaded to":"下载至",success:"成功","Successfully added to the":"成功添加至","Added to the":"添加至",failure:"失败","Failed to get task information":"获取任务信息失败","Make sure the aria2 is running, every 10 seconds will automatically retry":"请确认aria2已经运行,每隔10秒将会自动重试"}},O=void 0,L=[],E=[],j={},W={},P=void 0,M={updateSafari2Aria:function(t){localStorage.setItem("safari2aria",JSON.stringify(t)),d()},keyPress:function(t){h(t)},getConfig:function(){p("sendToEndScript",C)},documentReady:function(){S()(W,function(t){t.action()})},downloadFromIframe:function(t,e){l([E[C.defaultRpcIndex],t.url,e.target.url,t.cookie])}},R={success:function(t,e){R.show("success",t,e)},error:function(t,e){R.show("error",t,e)},show:function(t,e,n){e instanceof Array&&(e=e.join("")),n instanceof Array&&(n=n.join("")),p("showMassage",{action:t||"success",text:e,title:n})}};window.s2a={changeServer:function(t){var e=void 0;S()(E,function(n,o){n.url===t&&(e=o)}),C.defaultRpcIndex=e,y({name:"updateSafari2Aria",message:C})},dispatchMessage:y,openOptions:f,getConfig:function(){return{config:C,aria2Connects:j}}},document.addEventListener("DOMContentLoaded",d),safari.application.addEventListener("message",y,!1),safari.extension.settings.addEventListener("change",u,!1),safari.application.addEventListener("command",m,!1),safari.application.addEventListener("validate",v,!1),safari.application.addEventListener("beforeNavigate",g,!1),safari.application.addEventListener("contextmenu",w,!1)},36:function(t,e,n){"use strict";function o(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(t&&!n[82]&&e.enableTypefiles?!n.isCommandPressed:n.isCommandPressed){if(t.match(/magnet:[^\\"]+/))return!0;var o=t.substr(t.lastIndexOf(".")+1);o=o.toLowerCase();for(var i=e.filetypes?e.filetypes.split(" "):[],a=0;a0&&(o.params=t.params);var i="http"+(this.secure?"s":"")+"://"+this.host+":"+this.port+this.path;fetch(i,{method:"POST",body:JSON.stringify(o),headers:{Accept:"application/json","Content-Type":"application/json"}}).then(function(t){return t.json()}).then(function(t){n._onmessage(t)}).catch(e)},a.prototype.send=function(t){var e=Array.prototype.slice.call(arguments,1),n="function"==typeof e[e.length-1]?e.pop():null;return this.exec(t,e,n)},a.prototype.exec=function(t,e,n){if("string"!=typeof t)throw new TypeError(t+" is not a string");0!==t.indexOf("system.")&&0!==t.indexOf("aria2.")&&(t="aria2."+t);var i={method:t,"json-rpc":"2.0",id:this.lastId++},a=this.secret?["token:"+this.secret]:[];Array.isArray(e)&&("system.multicall"===t?(Array.isArray(e[0])&&e[0].forEach(function(t){t.params||(t.params=[]),t.params=a.concat(t.params)}),a=e):a=a.concat(e)),a.length>0&&(i.params=a),this.onsend(i);var r=this;return this.socket&&1===this.socket.readyState?this.socket.send(JSON.stringify(i)):this.http(i,function(t){r.callbacks[i.id](t),delete r.callbacks[i.id]}),o()(function(t){r.callbacks[i.id]=t},n)},a.prototype._onmessage=function(t){if(this.onmessage(t),void 0!==t.id){var e=this.callbacks[t.id];e&&(t.error?e(t.error):e(null,t.result),delete this.callbacks[t.id])}else if(t.method){var n=t.method.split("aria2.")[1];0===n.indexOf("on")&&"function"==typeof this[n]&&a.notifications.indexOf(n)>-1&&this[n].apply(this,t.params)}},a.prototype.open=function(t){var e="ws"+(this.secure?"s":"")+"://"+this.host+":"+this.port+this.path,n=this.socket=new WebSocket(e),i=this,a=!1;return n.onmessage=function(t){i._onmessage(JSON.parse(t.data))},o()(function(t){n.onopen=function(){a||(t(),a=!0),i.onopen()},n.onclose=function(e){i.onclose(),1006==e.code&&(a||(t(e),a=!0))},n.onerror=function(e){a||(t(e),a=!0)}},t)},a.prototype.close=function(t){var e=this.socket;return o()(function(t){e?(e.addEventListener("close",function(){t()}),e.close()):t()},t)},a.methods=["addUri","addTorrent","addMetalink","remove","forceRemove","pause","pauseAll","forcePause","forcePauseAll","unpause","unpauseAll","tellStatus","getUris","getFiles","getPeers","getServers","tellActive","tellWaiting","tellStopped","changePosition","changeUri","getOption","changeOption","getGlobalOption","changeGlobalOption","getGlobalStat","purgeDownloadResult","removeDownloadResult","getVersion","getSessionInfo","shutdown","forceShutdown","saveSession","system.multicall","system.listMethods","system.listNotifications"],a.notifications=["onDownloadStart","onDownloadPause","onDownloadStop","onDownloadComplete","onDownloadError","onBtDownloadComplete"],a.events=["onopen","onclose","onsend","onmessage"],a.options={secure:!1,host:"localhost",port:6800,secret:"",path:"/jsonrpc"},a.methods.forEach(function(t){var e=t.indexOf(".")>-1?t.split(".")[1]:t;a.prototype[e]=function(){return this.send.apply(this,[t].concat(Array.prototype.slice.call(arguments)))}}),a.notifications.forEach(function(t){a.prototype[t]=function(){}}),a.events.forEach(function(t){a.prototype[t]=function(){}}),n?t.exports=a:e.Aria2=a}(this)}).call(e,n(132)(t))}},[159]); \ No newline at end of file diff --git a/safari2aria.safariextension/static/js/manifest.js b/safari2aria.safariextension/static/js/manifest.js index 3612cf3..6c7e683 100644 --- a/safari2aria.safariextension/static/js/manifest.js +++ b/safari2aria.safariextension/static/js/manifest.js @@ -1 +1 @@ -!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,d=0,s=[];d0&&void 0!==arguments[0]?arguments[0]:{};return new Promise(function(e,n){setTimeout(function(){n("timeout to get config")},1e4),window.extensionMessageListener||safari.self.addEventListener("message",function(i){var t=0;window.extensionMessageListener.forEach(function(n){i.name===n.name&&(n.cb&&n.cb(i.message||{}),e(i.message||{}),t++)}),t||n("no listener"),i.message&&i.message.hasCb&&safari.self.tab.dispatchMessage([i.name,"cb"].join("_"),{cookie:document.cookie})},!1),window.extensionMessageListener=[].concat(window.extensionMessageListener||[]).concat(i.listeners||[]),i.send&&i.send.forEach(function(i){safari.self.tab.dispatchMessage(i.name,i.params)})})}}},[158]); \ No newline at end of file +webpackJsonp([5],{158:function(i,n,t){"use strict";function o(){var i=window.mDisableBaiduLimit;window.mDisableBaiduLimit=!0;var n="浏览器window.navigator属性修改失败，自动尝试方案2。",t="无法修改浏览器window.navigator，这将影响屏蔽功能。",o=window.navigator.platform,e=window.navigator.userAgent;try{Object.defineProperty(window.navigator,"platform",{get:function(){return window.mDisableBaiduLimit?"Android":o}}),Object.defineProperty(window.navigator,"userAgent",{get:function(){return window.mDisableBaiduLimit?"Android":e}})}catch(i){}!function(){if("Android"!==window.navigator.platform){console.log(n);try{window.navigator.__defineGetter__("platform",function(){return window.mDisableBaiduLimit?"Android":o}),window.navigator.__defineGetter__("userAgent",function(){return window.mDisableBaiduLimit?"Android":e})}catch(i){}"Android"!==window.navigator.platform&&console.log(t)}window.mDisableBaiduLimit=i}()}Object.defineProperty(n,"__esModule",{value:!0});var e=t(37);window.top===window&&location.href.match(/baidu/)&&t.i(e.a)(o)},37:function(i,n,t){"use strict";n.a=function(i,n){var t=document.createElement("script");t.type="text/javascript",t.innerHTML=["(",i.toString(),")(",JSON.stringify(n),")"].join(""),document.documentElement.appendChild(t)}}},[158]); \ No newline at end of file diff --git a/safari2aria.safariextz b/safari2aria.safariextz index b72ffa38d62ee592da0cf7eb0879b636cacf1ffa..89ced7c022e6dfb6ac9d8e5e2b5fea651ad4ed18 100644 GIT binary patch delta 14309 zcmVox!@ZZR>>tzXlBD)rSkCcD7Ii3r=Z%Qky?ZSS>H{I`3)zWQp{U+wuEf~}vv4#GhogKC+S-EyEibTdc> zaa63EC7gx2(KlAs4P$eCb<<0hqGJ}7X*N%DH2HJK zscif8Qa{j3(nZ3CyS9nRZv7wu~xm_00~ zHk>_^LK2#C)2+9E-5y^1E6*>qxeWqsReN7Otn1)mf74!1 zRRcvcuq}BLVab|*?hNCieyG%~#LG?gt=iZvZk}6PnJd&9vfgT!H3?Nl#DnOWUtc}x z35@rR-bj{E*a(t0JyfEp9@5in>!@7#A%C?P9u!4k^IoHW^z5(8rongrtIoL;aMN&m zDLC6x@PV~G0guN#I$N~uO1igPAyqor*Dz|sYbo2!=lC@Hl4`i?tCNb$XCH^=5XQ@m z*F64W7GEhB-YLL*cAC#w>?SX{rIV&6;aSP7QY9l(ee%os?~RA?L3@x&IXAJ%8L=v7 zuaH$3*4Cf<0NCJ6C`pEvMtor-W)8@DRs0WeGNX~D**Gp-dWkYB=x3l}Qz2hF8Y zQT7Se8Bk=s0#T>ELt(qw^!@fa#2L7*s(JY^3Vn6N@Hl^aWc7w;x2P)9>>pBPDXzzbDrv)7``iW+DT7! z;d8N6&gWseVSg59wm-&ufBskIY`RSrQYA+J__*kcF{PXXthshDcAzVP(1=3f*l*8& z=B*4Eg4137KGSIlxlj{-eQ^cFiNFLAVK8!R0}&}aLk)2#=1ftcg_eLjcbVTNIxP^( z$lR-0besN8a~qjNYKz9t{{>bsB_`@E&7v#E%e&0M@(7YSp;hu@Z5H{o;%vI7a`R!% zc(ycZ7VG7`g8@Ux5eQjNAec_`_V8$bekfEsf`K2vv7asgKM$X~%(;YZm;7+4JM~*- zp8iDmCqSdSjCy-J`ot`HGm{_J`2n|P^380#n62jb%S3uM{W^AzjW zKJ-_C^zSl<&T-g2w-=!uIvYkaZSDah#BL{T9tO2p`^v<#dxtW{U^?^b(80iek5gL? zDRdC9uO9n{N6Bt(?zO)#Dw!>I){$xd>J{&$^yI>a_D|j(+x7sOIQ{R)dz@bh2hR-C z@9Ov`iXp;;^DE(A8F$#$d&Zq8hZq6uJ?s7-+I`JCNR2)9!ow13?77&*+;a``JmhFj z9Hf{F806+M@4h6S!G;6vI+$aBMVP@Z0mktF#aK~SQV$sHaHT#WUgpi0N4QdNzeDN- zmAgukS$sQ>$GZ;@cOU|u3pmt5O5jn2JcT_XJSGit9Lcqj1PWL1Z$mT=XRZu?Zzo9M{Fb4oq1SN4b@C^F~PM8tM1p>l# zAjcXi&6$vdGKGQhpkbP0psD&cPQLngL?WMnWN-5e5HTPG{176D9RBAJvhmG$h*1|o zPMC(!1ArJqDbRu|YK$j;40Sd6211?#J=Z2HfM}*&!j)i-093oKFu)<)5McR~dghx5 zrJ3KYb;UCI3M2X{k^V`ezX1RM|NrcoTW%XM3`O_S1r(x4iqbl|0#T3O1WnNO_xi)> zII-+8CMi&$e+CTLm^s7Cdt|>cB3p!A+Wr9l*@(m$v1Wx4XhPb5QcLVDbDsluG>$$o zPR?=wQLn{^ri2FpKB!Y@XdN|4P{a7()6qfA%V9)M&!=1PvMcTECZyFyvWO=8_aQlU zLBn#003@u~?I{rF(WcGf4bQyjWKT!tXm}8mgQgx*2;@^7VMxzU z&riR`&s~u6t=e#Z`U}Vck}T4W^$Wu;d9FTT6gg)s^wUrC)jZY6k+KSQA&NDXdZadF zQ9!9YvsY2cJ-V2c9MSP&OlXp&Qq;qcevH>w+?JPpfmhC$t~=MG(zVOFR@$}KyY`CL zUh`V2*GKnS$=4P8x~^aM{p(G@u->t4^H#ua7}#0CUU6N2Z9{!~zHvU$SkitN_decB z;Jb0{t!a=ku1A?Rm-tdiwT8Y!k?v0-6H9%j9h; zo8)(?{Fcj6_;P(dmd$&5PUk_P^=YVy6dR=xEPFzdQV3Q~eyluhRnhzTT+38063GU_ zp1p*@?z4@5lo=^4*aii4bgc`Q3BAhb_kCy1g3?xMt1Zrffm75JqHL+K*3iCxVEQM; zF963ofGJo^OTw90X+cQ28wAKl?!adfAQfm{dGS%R99wJ;MMUOmE zEZRq^xePU2n$=lKC)LO)$>2{Sd@f5UfHXDqkt2M6G*alAGrlU?Xw7=RN%-RRAK3gq z$p57v503`<=}2K2<#K1zMbKK8lU`ylTTVKMFV6B%kat?*fbA>9)dpeYrepp+XxAWk z3!Zdn(k&a+-tpvUwH_wa%h2D+W}TriR$ZRfwH}@H-v9sr|NrcpO^y^X424g`5GS@{ zOI(0|1siVQ{GmbosTttIjT`pl)Pv(_Sq&}+nOt^@s-3q zA)$V_|MGD6{yZaAPqpX5M*wmn8}&ts}ppcykN#GF*>HNR+9%|M{}R8!v>cg z1KWO?)#iZ5lWh>RyqtVyg24wrs(AY$6HeR7u0-(Z9);L3YLHd}m6O_5Iq6)cb}~JG z)gwq*DD5GI>%6hG-iA=mzD5d&q*`Zg)-Ak_XlW)^&mw#gQEOgiNj-?Pg?MYo6Fdm6 z+IVzKc(lo+ekGzGVRDx)8(anNV{& z6?iS1?Nb#_sq9ci2vxl;)iu0x@hG+D(K{!2Z?|G;a8Qo!NxAuUJ9&vLM!_HA@?pZR8iMKC3y2)VF7oZF+A60(MFf8LCXu!EqBT#iYzo<$sACth7J)LS3(NU zeRz15|H&s0q6%CpAA@MVC(MFD%jL!x8&@xsY$~?bnI<&ru$`lI)t?((2P`i# zJO=hiErk8V?&chzF2IQjAz`j!58LyTgf{S&Tgn$n>a^X5b|j3}w&{=-iAmFl05667C0F znMB54=8h9M;w%Cv#W^}l2nhKMZM@-Z&8F?CE7b)w55BM>`k! zq?Wjj>S0feUu^Xr>|j2Dr|Xr0A^yov2}Nt?X6sgn<+hq|3nlThkr(ibf4gqOFbqZa zeubhriXU|o2e7@go!g;HM@ph=8u9}c?IeF+$4-EvThT!f?+{i3I>my%aKc!%Actg8qDQHcr7&H~*v_RVvRvgBCo-rO zv89%nz$tIQVIFNqkHaEBf6qF+bD7v-;h}_q;(0+9tk$));NDxNJA1jEurvv>xrDw~ zx;x7v3ufz<+$bgVNRCBG4!t;$b3&tlkvlPzn0C<~H9s~I=aU2^8hs-$Ae*1m9t6iyi zbmuX23qn%v9~yPDW+3ow?ofYrXpBeQode^jwcUJXy*U}Z8+1^>s8nb$Zufg9$k@U7 zI0zVEY=4a`H0bw+Bcy#`+&MRp;VKop!gxNPnia`dW0ZPnV|YTm%2bsQ>}izbe~^^#OVD{Y-opK4GOr~gyqc1W260$nB!i>P|z zd2QEhn0rOsNw*#P4g-tIfRV*H@t}y6WJ&~W=zkxnLiZf-6`g8fMX;C1HJ{?dpK?pb zujLc5s0zfaRpEy^TPlSOV~ZlVVIG+EDtHB9ImQ({m#DOA$(}_NnGgx+ZO9eLY_^)z zS1<$7s@L`o_Fp{LVPq>A@|5ujVQ4^Ru!5z;vv|*RmB(^o65N0X{5C!l8Hfl$;;)sq z)PJ^18Th#(Z>=bT#LWgrihK=p=Bhj{)4yL^4<-d{9*P{9BJw6`i4vkK>L|C2XRpZ9 z#LLX%WyrCQ5$9||1nMd9o|KnAij^*(kE#XtynMx0ut}&C_st+Wh?^kaW}yS9y+9UB zNyyext3(JmXWb_gU}efm+iGk5VEkM9qkq()5e-UEKR*)B-r@VU=8aU_~@fuiy^ihnc8 zf?HtG-BUfBFL(FaFE6?cYrhEY-03<+LDEdB&4BJWEdl8ejB_ z35lKqQojeX+iymd8%|8hajs!;7$iF~iK4M#_atM?w~A6US_= z?carF=RCLWE&*Nqe_C6QScrY}=~B$KG*@6X1@pI# zJR>vXlyvU!mc!nGN|M zW07USyGFh;?@mA+#wvX2xLkL;3LBQYO--yaQ|(EDe|lyiwbRrs`{s9_fBo10fBoAp zpffPz(P?0`XOxL$Pm86*{tL5=9q0iB!V4ENd?}-zh-2oC`;+=~**4AnIL3a(>AhK! zKzko}^WHQ!Cec_qs8?>>;X$oQ39UDTxIqMWozQwtD+;Q?KC;>mO{rN==~ZreVG=<; zu7dMKe?^`CP-tU{!zHo4;e$KorD99nlJu((@Ztja*RD3 zrhTE7GRaNTvf5#$810y(Gnb|VYt0nG5hBRjE-&*I3?+4jHBV)hiMjj;E-JN5udXsN z6RGkt8P7ZsMUT(HR5k0cWkJsPZgNvdk2mZMzf2#CaIxiAQ?{Y_49Fqr0ghPv#6m@p ze?&Ss(B2dYe4Zw`j;^j8?S<2BmwqA#l?+{7tr0-?Nk&XN8(m&|)BAoL2{UTMSeBQXe9GgjiB^wgj>=Wks<#L+DxZ^YXush)?Bw&FY zINFoMN=mu$_hmTj`R3y!IRliEQ+`FX)#C@%v$skUlhCqJ#hYIrSf!(enrqGKEk;s- zS*UC%OWcwGcPVpe9j!U=f!Dt?f7%%fcHVoS@o(Db$ALE(Ssz3!eT;k1ddBwEOXV^- zmk$>zj-VuRXBPcghjZ1;v03EVg|6LAxP|({K#s*^7{Zc?^-I_>aEj=_Q#fMCe^b^|k*y3c z93tVs39)fzgbvA6kAy+$YYlxO=Z{~l+>vrZ;_y%$vJP{7Jx(UAgN#E%?udSZjUe>x zKmb|lA$L=0qy-xb_D!Hj$vXJy^JgD>6oGoKW)!tLk7IsZqg<#6mI0&23b0Z- zf+uio7fGurzG`rjf9`VQ4wYvSFIf`lUVSGW8<%e0okM8LoJT{Xg+_4K>ASe*-9mF~ zIEC>W*=e(}C0ZP;Wtt|b&+IS8FGQ++Mn4(P@-W1m?X&WMaiwR8&*&%H@L8}f;k?B9 zhTFlr5~F4c00M`#rq0fqQ;gd(t3}ak5}ch`0vsIfY_vm0fAfr&Nb7BcH3%)m?yqQ?zi25ZuI=Eq!UwJc=TyoA#Ji9E5~XF%q>u;2?gxHMZJ zH%+2TPQK~GKe!D=--#%BN+;sXV}~=Z)-+$Ql1vqfovBx_IA_1=DatX-f1m#2shTg0 z&j!be<~k0ZezcuR=AVHlzEzwLRJ8rz!8kEfZ&mZi^ZM6d$idSoGTpM@ANx& zG1|xBTNsRTGKLTN?45oeGvy8Gd+%{Of$`aFMk|sul4&m$k;*fWpU~DAebqy81)rrI zPQsJv$+SZU6>?mt$SgqH?~^EyB;QY;|GQ4^#W_%{q!H+xqpA~ zc!$0+{r)BQ?mrxy>@FeKcmw_I!TWa~54QCF0x$#mURU}W?CJvA+$sX=a<^$o8zDGr z1`p|7NU}W^-GK#K1}`0-ugi`Qg|RJRr*RU#g#N*VfkVVS5v#do6hu)(u~%yT_%>;N z>lRynekGK0sWB*Mchj=)_@63|)e_fu^z&*EW1mW63T~WMryZdTK`A=Jhs*_+2 zjIQUoZTo0(uI5xh*JG8QrZxf4Pv~?sE+05-P_<}K78%MvGofNi`yKr`>!Xx-mhKH8lM_KpPhzTxU&9 zD}TJE29(dB^M^%;b2H&}pR1k@e;059`N=9|Je>Ni-mWJqP~e~(dtN+tvI_-kApOV= z;zZ=JLBVpN<3vOq+zRI^lpT{W_s~$kt2!mOUq-&eF)y%hNqv1^mF?_n^PeceZgXR4 zHy)#$uCx%Ye@f_6&+c%F z^t3#3sROGVK^Bo-p2m%X@>PVwr!))S;wRfbYo9w0Z~+rwzM8%!3KL^*MFcX^0k7Fi?dpO$9Ms;mh+lp>wE7m}P$W-0W4b+sZf5TP2W$Z_3a zYZ~#r3h1-K)7)4VpH0dCWZJr?ktdR+-18;nz+q25{N(=A$Lyd;FcuS(c?Nzcs=_)e z32WsCe>JHBR`AyL15 zsA5!Y{@7}3vK@aGN53d9WsZcFBIsrMNEqQC4B7)*N}2#dqYnb~lI2sA%HmpYc+(Qz zwD45+Fj+2zj((Oxe@QY54h|OM_XiVBQ_mM_X6!^UKDb+qKU>ib&58FWH-|A0qFn-& zSC2CC7n`CJvLeG%%{&d(>{pB4!;hK2{=TW%XW#t#x37QmzpsD&`8Qwu-{1fG`)|Me zYM-h;`ML-@a^Y+LZx(5BKFzqum0=xe|*tgfBE&F|H1&fYGWoEGSK4S zI?x23hG8D!_8e^=;bK@pPs0U$DS$m;feml(n6G}oei49&ksaE$*t5KA6FrUdw6&qt zu%&5!g2p{XwTQEROMj#4huo1Tn?|y`{+Tc=k{M=m#$)?!D?)mtLyLd>ukCRdvLveUWUnUelBXvXDn*&p~^FYn*#(vOOf3W7g@9}ZG@h3HJ=moPZOx4QR zc6g)d{h2ry?XR4f6^#q1IdHqjgzbwxhxPTNHV~B6Xanh*#wwi?cMn^){OkLe<9zg>MKc&C-x#Q zWY_)FsdM?xsk#uoiQ7N>VH^e%qjRgvXU*I9?BO)%OD_xz$psJ08JotU7R$)%OV-L7 zYoQ^{*|{6lgyTjh)3FF-Z22NMk)!W7>-F={e;d>qYfjPFX?EM?f;~%k;Otty8=Oqt z6EU9$?zwm3$}r07T9J^`D5yO#OkmOrC@heckTP=XdTl8ax*LX(a45V=bJ|*TT+L*Q7dZ9lhS_w&}-;C%z{QW;2sm z#~7cua)kCfn1yYg;smidmbAQ~aoSOPf9RSr{cy4xJ`lc;qL!6g!jFa8cjN@(qPA~s zN1nT7cxEdfJ9DYZjyUGG1)oggku5CxOA`HGue(OpoleIc3o|iWV6vg)qvi#*Q_bFh zNaWVCpdO=L6ha8 z$GLbn3NK<2J@SGu+ z&RWCdN6yiF9t*i2ND-a8ewm+IH5;vCZ26QI+Gx(?y5r)%-LRVp=A6&_f4*>|e2ybC z;Z1Q14CHIglDPf6`J%>>uEM6g{unL8#HD{nb;qG!(?34|%s^onGrqDX^28%L^K@h%CcwvY(Q)ds8 zkqRT@u#`Bp-S8stLw5ine+*Z3!zm_a(t;KQSy!k=Bpr{J>yBLb1;^#pe&J-HY9|~| zNI{%fRlh55XvnJfh?)u)hQYKW<%;=OWu=qkR+tBOFgv{gjb=iBpYO!;o3xIf3!E5NwQ;@t$gVo zl#_lfFBpbx{1-HPrUm)UFR1#yZt;Pi29_O3;x zZ7L+ocK9ay3JV2tG(RwgtStF_#Z11qDM-9=;mJ|0uPRK|HQ$KcH2L<8tDqB^LYP^` zXCu0Hvff3Lp4@6)TF|L668fBw5K zKYRJBr!W8U&vBM7fBduSKlw-(uV4Jr%b$F%j+C~R3&E5&#mGh+PN*VgaJ|wx6PNY+ zuxzu2vIuBk7w~76Ff-8yCuyQtDq9aG{rzAdp4g2f zxeuWx1(lZ*5w}aVZ9syqJurJ2tbpurf!&Riiz_`gUc*NmAXY3L5PN zTo1beM9}h$4&-F76Lj13WA7=3!AxQ6Mlma5At269IP;;kV&p#m+ zsTt=$bg2`?v3r3yilFO}yu^{Q4?h&~K?ni}J|fbc3guN>B(yyzFq(IPC7i$tjGoEQ zP;vXV$&XdVnaTI5;+DyG@c-5we{f_K6yn>?jQ#OwW9NNl&sHWUZ1(cUKfU_opTGW_ z-vU80z7*%%OoK}eKv`}KZ1&av{KfTee#5wet2WCz+!*LoUq1Wv>(BnS*?9G@e|_~IfA-avpIv|a?^mDv+t(le)%CN#W3cXrj?Ulm z`%b6J_vq&o7?3}rpQEhtf54e7p%uFvI#m#Tyb95C1?4HZ9GrMV(jGV?^6(iBtIS70 zE#b;e)WR(#;Pjy;tr{38zQAJhimkv@uZwwJ5z8h2#BUM8K??gn7N) z7G=9F3%i~02f#I{ELJB>vo=MpM#0onk5+fpd7HE&RV`)iE0}&ee~R2o1>r@>Xa=jg z1TZK?7qFIQKX8@#f?Z0ng+%C8kPCxq!?tuRvm)a%gGZhP%00& zR~$>gLvpf&e-NQ6(nIZMmLT+-;%6LfH5{-nIU%haXs(v7G#S*_4ZB>aRB9Dt`;-7t zCTo-s*(3K)k(LO6e|y>P;lYlM%kC@l#Q4DEt6<>L$dq!%FDcK-m*6&ZNUJE*RDJT;uV0m~s5h{7uUIV0ze|PjTq+zJNT&03lnL*yM zdlCp~cRqOhn041TO*6gxXteZ&mbBt&53Ill-;JeGn8Tq$cI!>E6*}QUJ|hcgJs652 zWg>1$nQ+%>wA^>REZTK-v>QTay^gz(ESb-PYDAq=OSeg`6DIujt=FICirg!3(bn50 z4;2m)blt|Xe@+aR12n_99bb-npaDPY6i*{8kz!pfnc$4xrD^x*r zvH*Mo_EhM*5Sv6WzYrmgiYKCPtX!Mf0*uZ`8^s&ul_y3E8V7gNrN`x|r(Z?i3{ z!IZ!j8n(Vp*L#_?VdL!%Q_l!8+0wOL%0gEqT+rGXg=63zh4fY0zHKaY?KHaRO@GTN ze*pz^wGyZlN2(Ydb!(dz+#)xVstW*@>j=|!i#BLE4ydGLUOqfEDo}U`5=LRIA?LGTq;hh4@EL`f1%OlY{RwWG-6j`pb*36_cux>cjvH>k!e?UnK z@YgjV8jCVSGgUWc&RkMFgEWfXMtErt3V5lvdf?)e9ln>rWlf#_7mymBvpCk6e#JvwYHUGNH&XjmwVG zYw)~6ZyZzVNHnj{i)i`-KkT{wLWhOQyc=zU7&47cM3xzQpiD>3#ieQtfBr*kC!gsU z;*J7k$x#uHrjimP89R@Qa_pXqv@?|!Jyl-iLq-ntc~>jnFB=kun4)T0ARG&iQ80Yr zDN3b=_+6>UUYk@Z_jCq@t$LQCh){Way*lZs>Y7S7(=JYZWMMiDN#U+D%bxW$xqAA? zR5FY{nSKG7z5Szie%X7zf6`07LNiu6^6Vo@GJhqjTm+6redh`sM=ig#z(9VM)$F+ri%jmd?+K@)PAQ|A% zXuh>&QmPTwu+zMKuWPpc7t4Zu_ITQjR7-E;HW2H zAuMQe7&EJo0!hUic=g{)%66OpIrJc6W;oyQn}_C3^+p73O%C{Ul{1q&e9|fpJJ(p*-4MTkaK>`Whwz<7xi6uAL;Hb3huDIET z6x*?*HqsvH5%wJyf8YP|)^zm;HulOt5J7m%!MZ#}P(+iScvcX}c1`Vn4YURG5DvAU zPO*;MeM9U{H;WCDNLKY|Ffb2ixU(g8hi|K(`@b+!W+ zUd|Z`qVQyr!%j6!!~>5J++^Y|+-iBHfF<<@twN4-T*o?df1F$+*~pW><=Hcn8|oR4 zZ1J_I{V>))u+u;+JFTi>s0{`7VJlr86>1GQXB|sYYq?~mZ(AZ-;O?t_0^5gN<1wmX zb_Y#e+%aZiHt{pNvdIk`vrj2Rjy^}cHV>IN^yYhprZ7dB;<^P%5l+>EhCN#?vjPui zo@2zAX2BQ>f7f|R5n}97A4#!Z`O?51p5$VNSxO5D{L2)CgKx@i4nz_ zw4#3k6X*kkPc0^@fjbX@p+2ZzHp#;MixFwMBkEjcR?c8Se+)HZGEp>o{~m(V`#wY-#u@== zyu=aVUCftuQ{)2=THHVS`?1&*O;1IIM9GCL7F&>eRjTEBwVK5@%L*-5Yr(gR?NX`r zMsPI;IYVStq1AFJq+HF#qTH@wt+ujUBQlSnq?#|cYo%Z{R}wa23v)yk6)G3oasji& zoR?x#f9%(ra$g{_tk7n^5%cvzE$53U70bC?2{gn8M0$@Njdj;7rgxn#M^fUiBmBWc zI>IUMIxzCjgKlN6FcCv6#uI~h3Krt2-_7`S$0RTL=7u;D@X1h{MEvvT@kaZd)opXdl1b8 zh9Td@74sioY7o1(woL*hX@8VkYZE~f$G=K44`Bv|X|VX6tonj54K7lyn)iAWAZRgznXMVHiEJG!d z{{5-g=!njbFYx5j_?2R{p?y?FQ^hq$mXJmaxfreTk(Bz*oS`gfN`ISE-m=nxSr+vh zDwdTHu1OU%rd3^GX{g7`kCwX0+9U068=alCY74W{5<^B-rUdL zw>n=x{QCa1^WU`d6zu0fTTf6*Y^&#Qt3cY;W{<3uxKeTAK#Nl?f_c%Lf zWzU~wt&Ps+LAL&;^MB}|SI2m#Gei_htQuSAaMtI@*vT4bETLUVW-CkJqX?j?G~Bf& z0*fp3bP^~1ii9UMz(2fMVgVag=Z12-N+xw+jS5K7q$%U)RXpkQza+s)roKdfkt&v? z`GG2`N>AeQ-f)O4@r{m62qH8!s#%ZQndox)=tj2y5p20k2Y--VlosRXkQv}~QAC4; z&V{5<7({|B9X>TGr7ZpXn`=(WWr$}?&Zajk@D1dY@2Le|j@Cd>K99fc0dF)~kv`?T?TYts1YwOt*3 z``H;y;v})e*Yt0jvFc?Bf9p07eGia-DEb=QnBpd~NCS9{_a*WEQcxsi%UbN%^7{3q zWIM~fand5VfCG!vh#b%18O@m#|Etf}S6_MkmCxrCY~u8F683%JSIeaAlzr8q+hIJ6 z!eU*o;5<-`zBaOM6zS`$n_j%)9lfl~vU!@D+}xD1Re*TzxjHjtf8HXD@{h}+%Fos} z9jCTxxWSmvLhZ5aS({#ICJ%eoX?Gcg;Z4Li0u=r<1YdWCf`Xm|Ud$p#&( zvg_ANeP69e7jcvB4pyFS`_s-Cvr3#VpgrBLOx1;p>aiGghr`~pYe{|_~+J#B}DQ_32C655ByKO>P89dYG&i9p3?S1*Mse^~ZO?xww z4HVA7uH;U+A!~ln8AV0)P^lY31o&x!*IZ^ub$Kt zMu$dkEJ`S7`0=YAD$zs_sadvlR4y#7Uk!$-q9|Qf8SHTF&i_UuM)i?m2u6oI!uB z%BF<7{GyW0MbM}ZJ!Fse4r({i^;MXuLJ-MqmlfUVf2dV@AU=OQxcldEoSk`x-fEnE zf^{26vRQ+$)83b&)H1vAV%w{_ zIhE~Ci&`~X$lEvUN80W?`>sd%1CmYFe$>TizbVDKg`)UT4zI7Co4cFJY*?$R;kdxZ zORHA#e=EB(nu~o~;?iU{jh+0{&C_Z#Ek3n#lU5b?c^8D^eZJO!OH>%u+i1Nu5wB;0 zt_Wg(`_MS3jHJ2!Zb13GUFq0j9W};XdpK@JncUPGju#{(4Zm)~W`7q&blO`=XESc* ztGS9P@pfCLVjs$3*seU`?66mRu32j7XPTzCe?I7~8uq3aUR1~Fm-gUY=G109_Ca4d zm+8>;0{w@l{{HjaPt_tFf^(-a(9tBG-a~$uIb9y-&s|QNzH4)y`kWZPX>*!IPkrHY zvs5e=LE^ACk21R-lY_VTGjlfG#Y-V$t$uvm^u?G`#sF4KSr}W;5r8X1A+gN2YwA`T ze`taeuYO(Ww1rs8skgbfgJgtbf(X|bS>^%}!Cg%?u_$J?q+D?&0JH8gzbtgxAQGXz zm-Fy8`JMVU)Ui+ojlcf!jbMs(*jwpkS4>uSnbh(Kl0KnT@*<^|`K05lyQg+@x@I(A zX*rM7>OSdEBV=)eOe7FYmU+E-G*27Ve-^jF4`7*37l6Og&t2x+!ZurexYeEfxifF2 z&q6Z3%gEQK!%xh@S2J;;&yS6ncr}|W=j+A&Di*FOzm9|ByrdQZ3)#-(n(W!#B!$R@yk%ewzVyRUf%sWzvcyI4SlT?aduxsFDzi!8;6g{18O z8!~;FcV7}uW6gkaEX=SZw#E(tf7)^Z#aL2DP#0)yF)2SGUgkBHN4Sz`zd`B*m9viH zd33voChr)S82;Te+<6D2!BQ- zOgO)Y5=vt65tS&QzY!sv&tM^;IbFBzXAPx^ZEWP;QK=$$RcR!y5)5C~P&*w+*vMcTQCM2FgN)giEhh%D6 zx%A|KAfxYg3ek5&9X!-(Rrd3qjSfH>-2!+ysOV!8LbL%EQJRn$Rxc4nysK0`4C(pw zeEQvg?Sdq?Y6H>~e-empFC>%)hMh^V;YJ}MdDQby^M#E{$|(wh??NxuQOl8LCx8y6 zWXDFYh-l zHyTsgcjMm2dkTCv@!iOGGoM4>pgzUE#eD*P2l+L6PAl}c*kA5jUY7SMEA;W(mDnPX z7X_3;ewWG1RQ4tHE|ssjoFK2)=Y83{r{}cXW2nt7%hzYBk$PY;@+6HRu%7)GbH^L$ zyhH2ME3QI{f80InvuWtrY}8JYJ*C07ftO#I>%uyrXBqvz?~I{d+O*VCle?rJ8m}oa z3X^6mp??3s^ex3#fYT>{W8g$n!V+D*CWHZ^z+(y55DG@1febEbwMBmvW^V3YYI*po zq!O%*LxdG5S<0P~V(U~yJFyq3@Qw$A7{G$^0 zTDi5GgjavR!Os7K{2vN(;(LSqe5Ejra`%{sy#5#Xza(&bslY$(s#}hz8{*k- z#C>ZZk$U(%$iN!)O*l zbRW%mOX(QJ~^9EL?hS zf4vXvlGIOSsz=jP+eeD7`sCp85h+~fb&2*-2OCxEqLLNi#-}6?D6)yTgpA;+^DLqP zZTHcwbwVoRG>a%DlNMszyfSbT7PNmMqM!Sh+gRUEmZTlU_e?aRQc=J5(l2W2l_iNF z>Ir4DH>8GCHbqVW&lQR4^kLgb3mf{pf1)Z#(%Xoq1kpCd9EF-XWzBA?A-$~a{le*2 zDt6

;+wPwLlDOCqm_PEbuC;?o+M!YkQp%AynkLR8d^LWJ4`-p6&%rGn;0GbUJZ& zOHzhy)5$Za>Kuf$S;dk;`uD`>arwByg|-LU-@Lwmy!|%-009600|0Jb^6NoZf(HwJ>?=`UpH2Y- zwo4d*A}s@w9bZ}z5jeTEJx;X(J-V7`QIR(ND>S0Bd=Fkc1wVXfT>9r%Ig+Eavn_Akt zYNbt3=k#Y8c@eW-8MuP>TRcJ9&BX>5T-hprI4whU#;Bd)eN=pAnEzb0qhS)GH6S+1=o*hS>prMH$E<8|A=r)xI}aYG!U z_ah&Y_JZN7X%}Rz=`h+@{|As5%+(QwcojgjWS_~g8bs*Y0rD~uP5g+W3q!{Tme zDDhBmAB0*CG}*2O7`C#j+D**9AxE#;)KaaTO7jMmt#+UsE}A&})=N?et+aJUJ*q)X zocvFWI{{@j2y__}=23g~=e2#KZZz_^Zm$z~HUpDNpONJ`aUqYDWJUz7>wh09L-%d) z6rE{dd9WMHHJ(D^&A6%K*Yb&2mIY$e%J3tdEtSAVkwqR{HxA3dCGLt4j^LRjB^8VJ zOrpq?NI-7`u1IQAX;M$Y97Joc);K(P@mzcHze~TRsxxYoK#SWpSzggW6^=31Is`WSl7? zZ^CvcaCAj&Oy_oK1;9eFg55^72Qq(&3A7x!}H=t=Jki4V2=Z z;fIHC8{}CmumN?J$b=aQ*hXrV2moiS2V@GYNLgV^RW=XCzokD+9e)~AzX0{~!>5OD z?|I3<`1SL{$1fZBqH?U(;=bX!dY&q7oRKA{uQJtIl_=Ui@$9vvOeNR3P()D+ zUrP+0Eh94HTILjHPC(>S5uu(+>k^O7KyI-Xn97j%uNv0L*~pR!F|uG5b&0YZkjUl> zk8xs4G~)t=<*(;wlz$1gz`}c{d@x_`H##pbdUf+44?elmbqa^!{|@9K2$#yxSQc0N z3Z{}OKyAwcSz7e8OGaP?0;16uPL&f(4a#w*VQ~-<86wdu;8-0M+%rj%%IFi? z@STx(!i57N4YY|PU#*?r=auFkx8N=TUHpGpZ;#tXdjBfgiJ_3UBd)Y-I|+4+;5g2~ zhd4gOZh=CpEJox=nlm+{l0)zANqU{TD*_x)peTw0#T9*>HwB7A5BWB6ntqG^o*_k% z+I2RUYhtX(nP;Av=l|~+Udri8#IJst8@=+zXA{02+}q#9Riy%FI&b(yQ4Su1b0l?YG#CBqlDF zQrqC~3z=QNkg1HV$uPg;EV^CW?J{k&WKkr7++L?LNL0Q`#r5d;Sbuoh?{+=q9SwYb z)b~Trc)~qxc^u`^KGjxcuSL2)kiUNx*r3~uQz^1~I>v$reJu00wXmubRt6v_WMqe> z*e72s#av6f!BI0D{@zJoWp2HS&L7_M*gH^(naxtAWiL@8HFM?%GpNX8`AX<8HrfiM zbMM{%`Qz7bzW$eY{c)U%JdfVB^2)wD0d<_J_?72#-R&AMthh~Ws&c#INrHa{b|JOb z)Ghn&pT7L|&;Rx24_`rNI7~ph;h;UMY$|(NEG76a>@xMB2M~xLUdZ^BOnM?snLqAN z>fL4AG>_60{L0;XGh?8=4}*DcT3Bl|Ru1ZwTYq>|Yf?h%4I%Cj!Cxy{&uK+THMote z_Cs4~Hc)z1*j{WB$j43e+Ngh|(;watn*7N)zm3nR$@Tst93k1gca3uPbJZGaMt8cD!V{t zttI(FWU{w&Sp0d#aKM}TR-WaOj=trC2WK~O2AKo#&c)vJp5`&uMdN=7v>)@*Bu7!? ziHPlJ;HCC@CC#j3MkWxeReFtmlph+nC&EfztxRU~NI+$M-Z0zkIZE!1Q;BLj3WKBP z(_cfGK_X!}i8Qs6nZ0(TYZten=2AoXnV6$^+!jdfs zZEq9i#r1M(Qe>~(Jsf{d1PZPtVBOIz=BX&UVaLcTqXSRzh!wi@)C9IcbwVT@c`+F0R_K^a^|7#WvuO=|F6U3K zR{qF%F`e*O9J7B8^FuvWlh#JoqalApe{qZ`4&6WmS?VEwyVFRkAeP6sks&4P=$9{^ ze-=;#>baUx)aoKl`DtChp(0oY#X6SW3G>EZu*uJS7Ix0pCv(p34LWP&sG9`kWOK?p zzx-Kmgg<`R@y6$u=Se4c2c&#d(uSRTr^DugEvJd?xo&?BcDmj;2q*rIKd1BM#S{{F z1Fi#PZPbTEUOk_AY|H%Kpka5hm%dKZ3n`M#rhc7E`y`e0n16KrQp`U?sr48UxvGlo zV$=+BNamw1A%C-_(yC_-HqLr(CTBPZg=561e4NC&8*y_l7E;<#^CiIaOOQp#U*x({ zCuI!OXNrF_2~Qy!iWA6y;Am0mhK#XSiYOzI&E5LEs)!!~XVuxeo`g`N=1a&D^_uOh ze{hCMH8{e4!@N~HpdM(2@)xpepmE-pP=t>NYYYo(v%DQ_%2zid4Y(;ltUm&|Lcx@t z;0mtoBWX3oH;vO|ho|v}CUCW!EQxe)ew2=_Pr!faU=w0l@MMUz&{6b3cqdBd+az3 z+;e{=x*MR!z4&gZdaG36hUjt2SJ9d@o`)$HS}jYNH6(KtAv}|3?(}(xWLR48B^+GZ zur~J8B-fmLGlYL|7mA^mQ1X;s!dbwMXF;uLzFwJJm5QCID_ESf-}Dsa7#4m&|M5)C z7dB*r)72F;Y*y9d)^G4@YK40ROj%?(DP(_T6hTzRS0YJ}h0DdA!TZE)iIXdA-0$=| z4>8)u=2NtO^US~l0hCktP{`it_c2pd$S`=Hy9tcXW;0r0vP5RROeCtvL4HQ8F?!Vl zY=qAehqL%>dN%FQMx`8=DzOXD_WL9XBq=!SI#EjNt#3WZ#}5XlryrG~*9)9=Z>N9% z@|aj^e!dY9*fX=whdl6K3`Y8E`_lJ=hM{0ub_V%!ond^v}|gw83j?2Q0!Hj zKfOBJPAO}(j^1H+i=D6g}HxxR)u04(Q^mp%WMdr+YT!XjeLkbp$@`;LCMJH zhm*p0IV*8#bXO4?*|hD|1XYe_V?E(XV6rEny(*%W_4l}u2# zx?QxgPECM`t(;zC37P~jSl7tAtw+sQhpI)_;Wt%}x+Fa1Rj>fwrYqq9FWSkdn%LXm z#(Xp7wNZjwS|8<=yw1H6r{rjcP4+~@i&mq#99Pq0IhpKDX-lV~u5j1ukR%N!bR_$= z6?Lh^U`lPbrQ3m0snpO@vAKV#*Bbz4a4UcrGy%*207ju6-duco>*CYq;?qeuo&eRA zy?^yPs(wrNcHSA5KTQi(UMm5?cc3S<+yR|XZ@0B;Ea}dGdXfk4{qTj|?ai*`?BYV^ z&rDKKrl|T}YG;Qf;L#r1`Vwwwy7CY-a{r;vV?3PUH>cnC{9$$5hiZR?cA|Xgc5iDL z&L-mv3*C>=8LpNk8?aYKq zDcg@23(@GcDE4sB)@Znr7eP_p$v7z?{tMUo?DLxpkPQ$BCtobAUFD+_f3vB_%4@^$ z#2*2yBZIYC%AJ;IqT+wXK6?J~-%-CN16%eIqjElEPoMpwHR1Z@EXKV1Mccc`m;&69*);^cNnsG0maMDS25%9G;CcE1!7l! zJ#;=V%EwNAsh|Nwy6nIuMUh(c2A4WDBIzIjzgDsASi}5dOILqOyIl%*z4{}zc?rH1 z^-aDiKj7<9ji_*Cld*J+$3X7x9X0JgzmNt(~dD%SC$%{BsD|=(JRU~;rfK<#x zrqKDMsET6hF3W#u=UsMXJ0SZx+R|%ef!LT=O78J(`A(O7ljd!BvGY+Kjmdkgs}b;T zL^@KJ|%w_ky)#1A$-hI-g0Al-m!Yi0mAfcCL7Vl&|=bu6n$q=4jh< zoZ}2m-#ZWb?%&}2g#5<)5q2*l z1D~ps51fBxO5J+xrfI!b5?!d)Z=a|XJxn-u+M4XgpQp*+Rwarf=VXXWnSCs*2#*Hs zfjuQn0Iz(Cq(v`zF}0a2i(JE-Qh3ucQ2ArCTne51Dua?_5*-~a#~%zPoTgqZ)Xchx za(wWx9Dlwd4$X=8CwB)O@RC~smG2&95-zvpy}*Br3{M^8JX*8gEP9VWW8wNQ&7L9q z?zew<^ZS2$^V=`K`|98S_s{?Q{n!8T?VtYP`)|Ja?q9!p^ZP%3|K)$8Z@4R0hV0EZ z|M=#2Uo}^L`=|eA03o$8jfM=gIJybDfG%N}$0#bJ{UclqE9hysqW@@(5kcId5K%KEgb zkRFT6WQN&-@q!|PXGo8n~Hl)?@ID7-o3vi2ba8h>$q&L+nvewBaCkNOn=mAl(m*}jVnP{RlQ&_o8H>r-)w9l}vy9gg6w?zG+__?Z-F%-wgbWd-9rRZ+3%^Xm( zod@dEZrz7F18d%a!&~3?{>rP>eTPU@?8b+7xB2beDqwBp!N?OGxOb;)JDB^tao>O6 z#SA=G>KtpTw6*i=&8C^(ZhC!vOLrK)2HL)Z_s!l>Qxzu66VX>$U6yXNQBwj(@symY zWI-Qa09+3T3~Wk2FrUY?>Fn?;qZ(FG5?-zz>Eie?c;A)6$K|0oi>Gz7Z~>lg$4@T& z?+`y4PpAh3PVw$E!g%8EXb~PeRPKMqAsOLA*9PGC)`t8p0W0}jUm%vbE9K}t`54{i z#2@}2;6??2c-p;MTaOz@cK$1zdLX)YN zZlb$5qY2qS^5A&mBk3&aVM2v~1|JgkyU00nFB>d$zj@zef=e5b0fBu9T%>_uM4 zuKTG|=klFXbuRi-cX0Z{I1Hvn_hygJo44-TqggPJUKkjX3m%wrHj70qmXSA*td%v^ zLPMJKGdHRU$Bm9>6A{SR@t~@itTi^AqOsfTwaW#2p76lwSiTz^&)j3N zSOo5wckIeA%IjK@kh3VLJu!bwV~2MGE_+;9K`2MA=l4N+n=!j9IjgarbrO1k!I)_# zIgy^BX_U@9X?3hMa(x?=%`b7K2$N>+KD`O z+wja*K6dU>l^t=+Zwr4uoyB8YSoD`9`oCUxjjTJJjyn-%Vz$6!L&-(CF*NXwxzz<_#n8}GFiz9YPOtaZ#I<*!X za5Sv|U(>I2iN&J1v35aou`mKFoQl9OEjh+tE+pnWR%>zUKL~$=Kny^*k@B=u$sbzr zY%maUY;;3|9qRAV%&+-ga2nTS$V@JJ5LD9|C_&5DfEbdj$Lt$XD5iTTU~H5(P;9$F%ba1KPqo_h*4hNRW7t(sy+&5LW%EC{^d znAgOah%Rc)MlFA)@x!=w?)iSroyic&03v+UFY7l7zdB;xTSH$Ej3LA=zH zSl@aMqeNJ|MoM873R7#&L3_g8)vDMj8)Q|<2L?=`b?gn7WfX%TeBK zA>Z?SfkA87sC&&v)WMd#FYO>nNMl!eY9|P;+xRbNR#nQ1V#O5$p$@oE>i3{_VhD>;!)AYK5|US=;n76djPxjTzWD{YCtXRT zDw`cR8ym2+A{Wb!B?7nai%uAxdXNzPZ`atSgfD{kA=@p(H&-Qpclj`x&fz;W3xLJm3F9* ztlEF!>+CBm6v)y1z!!hBX-l|JJ+s)PGkyUW*MKC zfC_d9V|5)3U{r|=4t~X4i$fBv6W|NZ&zzWnUv zub#gA$3MqezWnjeuKwgBUA%hnPcMJ+xjKJR+FC9IGujj*8?is7ikQLmO6ycy)a#?N z%^H!%(>Cy%{1Ev|cphn7V^10BGhdBV&@ADpC#=BaEwoDS{>L-E9JB*}jR z2sJ6FyqJo(UHZ2?`zP@3mK(?3F}#2EVgV#SAG>jvDPgFfpyfyvJ`A)4lT z{W^HlFAEg;DwysSoSwp?fHUd#U(*R3fe;bCq<@R-4vEJe%mm8Hdn6Uhs3Zs2d0%V7 z0k{>5q1xHL<;90%ZzNUauwJJMtvb5Koaa#2xp}uG-f?cd4QqPi=G}L8Gx>iJkRO^J zU=|W;EeWVYo%w|^S5}|Rrb8gnLoN7($Qhq#%Iyx=3mF@X5g-W+XMDH2GF?w&@KztN z_B7e=Ht%lt>UA16Qy%6U#&L|ebEl`Q0lwe9-OD6yRr1!zq6|Y=yoj_{$s<{s11+CM z*@;iezH<;xCT=jyl+l7w4V-^@$w=8H^G{ZaXL#W;%;z7?0$+H(_r!C9a>s9Fy}FEI zK6`6R&u5)^Q|pOZfT-MRkEjy^{2~u^AI=t=EP~G}Veh)$aQ1tmOOX|WuBl5F6%#9Z zAls)~<8T6h^H^6uQ0pOZQ_Gdtg$R^-U=L$2COhg*%q%pl%#m=_XwQGKzFpaHl2kXU z;zoN3+QV)D6tsM!3pv^C2E8`@*t?2hFjLsNQOt^P2%xhos1=&4KgxFMY>mJWippds zi`mO`ZJ87iD{zzMCY(kA!?UGzD5^Wq(hUUFpbVfFZiuW0`Rt)n1)=1cVQ4(#p5>af zkI3g8zE44zw5AclsX%|;(+XxNrNvy@@3Ts%1NN-bMXqPesi1y3U`8Sb_tYtBl#}hUm9u0#$b_1dv0I886!KB1hs;Ge?@|C9t&v)a^cj5< z4eUCFW@_>K6H1$C$Tb6lqFUN&mI%m~f47j~Z?SqwYnK;S%CUcL>Ebjl=rrI0HFxUu z{1al4nsE+LmpV}#yBCOq2)Z803mh5y@Iw*rg&=?sB!bMDYe>}d?d7s(ywfPB~z5MY{FF*O` zum9$^0FjKZg!+Fr)A&+jP?j45n|<{^e{uDj-!QHatIe_w*PkHzJp1zUqtCBC{;#VS zAAS7~&tLuGi&wvXQ5jO3~BpXFnJe`$XjEc5L7tEa!b`sL5nG?&kR z_3DdHuU`E0>giwdm(M=^`m?`nHeUVfUtj*mpMCY^XICHp`{gJ9_Vveqb@lA;7_9rg zqf@y2fz$2rUHUlz2IPxH5mG!N@ya@@{LecfyC^KqZ|YQj)JcfYMHnd3knexoKmf25M<~FA693M-gGO zYAWXSrdyOvw=7I|!XE2a=a0A?@(MOQq1z`Vk%S$vAqFQ8F%zCq>-q-TBYJu znW5f^dmIR9cRx5fV!h2R(@d{G8ZCXTC9QvW)(0yv!gph-6lQ;x2ovb@TP7xh4Y( zXte#d$wLK&1YNqZtP_Lf0L?INhZmE6=-2BkRv*g^mM29-SCH-1TyQPzDHD5LBj$g+ zemR9fLHlfgxxtgXek1!v$PmhqhP5-=?0mu2Mmb{8;Y%)SDwQmr5LAjw7YH?}E>bAO zBUC_1$T&;g3?c!QGXg*#Q%8YHD26!0?A*yE)TEVW>`dx};LTy7nt^hLhNb{tAej&y zA=x3bJ*c#~2$ zYg9pWvl#pa?5WTA6;H$<)%Yq+)Zi@J1eh46xyv@Pg(QSE3eRhFqfHD{ zH%bPMk8pGl%9>kChnOv;KbC)&S;P1O9%f=uj&-R;UmmL~R_SD=O__;NE~cCj_ixZ; zyv??)22%oCXxQc^UGinphK;woOg$#ZWJ}lfC>LFoa6xNl6i$G96xdhE`?j&vwcF^S zH~p<<1r*HHN}#eFsbX~1-ECTMi}XyYE&yDvBTU;Z+Mwk)ppue#`S5?#s6gQ%Nc5aQ zzcHZ7%3+sp|4S96`}lUbTFthkQJ!gP{*od?2`d^=SiY_Yqk#}SPjs!cC3GEX8m}Gi z$Yez>3yrF13^`}bgF@eUVY4w?p3JJ4=q@$&T0*6f6u57T?8~&Z%~qG}F+?EW&AK_v zgr0ZQG)hq7S!BL+IdgyEnQ&9KuAv@cJaL6m)_%eqtrgd`Ov`p{tdvX zw4VZW7m6jk5UMIC34*V&I_y0DZU&kMW#LjUT^@`6p(<&hpvZEajb z8cJG#zpe?A3 z`AmlpcN8d5j*56Zlav_A*m+o#WA{v?ovF0!sq!ixGO~ZC&%0Xre%X*P#1vK20^wMC zl7it&4^k>M#P3Q)_U5EgxvMiMY~AA&MTAP_>(xn5Ro7IynRapNBMZ}MND6nIdG@%k z$<+furt)F*$@DwG>;)jb_RC)NmEQ9enz7cAXSX3$lTioEwOy7<@wKg#g= zWdHT92Ol4wGE~ga*(`^>X@tUqP7(ZU<}ciK;Yxu99*(AsInC(~>nv$v&Vu*OizIbUYGH@2W2yt`znBMb zL(B&{MYY21q1hETLRicOKf7NvxrI~qF@?y2qEHio>D|C;DZT}zh(|O9jBtim≻6E`K^1zCpE`t*v}2)Df8+z?rS&kB`ShH7osNBm{I5Nf04YWV4z2?} z^#Iij#xdXHiun(^MG*P7O-=$OX@6E-ZyQAv{VUEqtY*~F#Gyn*ww9`d2vju`DS5Lj zYrK2yOuC*~?Tj6w^-2{;P*tEl(1QBFmjr6X12h62DiQU^fGxlA7r48&x2rfIX?gL^ z$G!K=J#+3IA3`^l!JV7d=$N)P+dSRatT%c?9XMq)RUEixDH&R*S(m85k$)x#=~oR{ zI+96E`=JSj1JF(c2}lRq5#%#UY>=qf5!Teg9mU`i2Oqih138k59j=Aa8j|<-c5eAC zLJ3#GnO%g_eabjtxN>v%_6NciOR9H7AzvnKabT3DgfL!$F9!>FA>$ZyxV5jMkZP7? zd}H&i|ITl@S#xxrn(_~o4u8#|7`&^j>_+g8RN?TJ8YtI1cgJ6=H*;sqclyVJ*^_&d z$4?i=T8>m-I+IL}zn$KF^7o5hrVpP_emtK2{?k8yem?u`=gIx2lV{(|etk6k>iP7C zdvE-8_hTdp1AYDd^tVTI`*VZlAznP5Jo|KVay5`-LcJ}}RBpG^2!-t89A#q3av=b-Gh=iwoa4-30X##GT z=-RowT_-nmm>3n3hRZU>FN;{7^M64~gv{z<)VNIvrY}>~+~<{1Pw~o?e%tDnpl|#Ph0@U=^NUH7cVlD=Sdu z7*$^qp7vsN64%i(N4kJKajbt>0##%jNMQIyf)2r7QxA?`b z$(GH)nb=>l;dzlkwlEp7pFmFx3g*_kIrKX7Jc_-KS|J(5Gk@n}laEu2J*&}5wH!c$ zpq#gi?x{ZEu}tK^HVDbuJW|#HwoO|a=3aYdTZg-g#u{`ht&XK7mgMOwk!SIO4YQpw zmhr3CUg1$#woRGzi(YI+1iJ6`->!S!2*pyXqgu+%R=s__I%%X?bD>8KhcfwDl$ z=moe1x2FbRhJTJ$VDT+*^VOO&HRP=p%!$JcHsH-t75D&ww&=41*2+HIT2MJ2TiKI| z5*DJKkYTtz!b2^0DH+VoE2X36xjMhzydbu~O4yco`K2$Wp+tUjs1{ue3Oxi}&&z+Q z5(~WXIK|?I(+lp(6_$U-W6WEd+ENhs9F~@zR}RI#v}9WtyPBet-Tc<$T$PLS($@S? zoCMwSh3#NWEJSlhLF45+U(8V>d~M@GYW-Fl9W>Sgz3>uRZML*kqLg{D&hvxoFi$K0 vu9Auua#4bd{FIni6LOgAJmW3=YtUxRe*r@~aLb3uxdMmDxdXS!xdhn^h=sXx diff --git a/src/js/endscript/index.js b/src/js/endscript/index.js index 4427d30..08340de 100644 --- a/src/js/endscript/index.js +++ b/src/js/endscript/index.js @@ -2,6 +2,8 @@ import toastr from 'mini-toastr' import bdlx from './baiduLixian' import downloadAble from '@/public/downloadAble' import messageListener from '@/public/pageScriptMessage' +import runJs from '@/public/runInPage' + if (window.top === window) { (function () { @@ -44,9 +46,17 @@ if (window.top === window) { } return result } + function setExtWinConfig (config) { + console.log('disableBaiduLimit:',config.disableBaiduLimit); + window.mDisableBaiduLimit = config.disableBaiduLimit; + } + function handleMessage (e) { messageListener({ + send:[{ + name:'getConfig' + }], listeners:[ { name:"changeRpc", @@ -75,13 +85,18 @@ if (window.top === window) { } }, { - name:"sendToEndScript", + name:"updateConfig", + background:true, cb:function (message) { config = message; catchIframe(); safari.self.tab.dispatchMessage("documentReady", { cookie: document.cookie }); + //百度网盘取消限制 + location.href.match(/baidu/) && runJs(setExtWinConfig,{ + disableBaiduLimit:config.disableBaiduLimit + }); } } ] diff --git a/src/js/startscript/index.js b/src/js/startscript/index.js index 8219fa7..362d36e 100644 --- a/src/js/startscript/index.js +++ b/src/js/startscript/index.js @@ -1,8 +1,6 @@ /** * Created by liukai on 2017/6/21. */ -import messagesAction from '@/public/pageScriptMessage' - import run from '@/public/runInPage' function disableBaiduLimit () { @@ -47,30 +45,7 @@ function disableBaiduLimit () { } } -function getExtConfig (config) { - console.log('disableBaiduLimit:',config.disableBaiduLimit); - window.mDisableBaiduLimit = config.disableBaiduLimit; -} - - if (window.top === window && location.href.match(/baidu/)) { run(disableBaiduLimit); - messagesAction({ - send:[{ - name:'getConfig', - params:'' - }], - listeners:[ - { - name:'sendToEndScript', - cb:function (config) { - //console.log('getConfig:',config); - run(getExtConfig,{ - disableBaiduLimit:config.disableBaiduLimit - }); - } - } - ] - }) } diff --git a/src/pages/global/index.js b/src/pages/global/index.js index 09a58df..7db1e3e 100644 --- a/src/pages/global/index.js +++ b/src/pages/global/index.js @@ -42,9 +42,8 @@ let messageAction = { }, //配置更新后推送至页面脚本（主要用于开关iframe拦截） getConfig: function () { - sendMsg('sendToEndScript', config); + sendMsg('updateConfig', config); }, - //配置更新后推送至页面脚本（主要用于开关iframe拦截） documentReady: function () { _.forEach(endPageReadyAction,function (obj) { obj.action(); @@ -296,7 +295,7 @@ function restoreOptions () { for (let a = 0; a < fileTypes.length; a++)fileTypes[a] = fileTypes[a].toLowerCase() rpcList = config.rpcList; //更新配置后需要同步至页面脚本 - sendMsg('sendToEndScript', config); + sendMsg('updateConfig', config); initAria2(); if(_.get(safari,'extension.popovers[0].contentWindow.tlwin.refreshServerList')){ safari.extension.popovers[0].contentWindow.tlwin.refreshServerList(); diff --git a/src/public/pageScriptMessage.js b/src/public/pageScriptMessage.js index b2fa75e..7e1de18 100644 --- a/src/public/pageScriptMessage.js +++ b/src/public/pageScriptMessage.js @@ -13,13 +13,15 @@ export default function (config={}) { let count=0; window.extensionMessageListener.forEach(function (listener) { if(e.name === listener.name){ - listener.cb&&listener.cb(e.message || {}); - resolve(e.message || {}); - count++; + if(!document.hidden || listener.background){ + listener.cb&&listener.cb(e.message || {}); + resolve(e.message || {}); + count++; + } } }); if(!count){ - reject('no listener') + reject(document.hidden?'in background':'no listener') } if (e.message && e.message.hasCb) { safari.self.tab.dispatchMessage([e.name, 'cb'].join('_'), {