diff --git a/README.md b/README.md index 873d0b9..7a56e5e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ through a browser ![screenshot](./screenshot.gif) - ### Installation Using with [Vundle][Vundle]: @@ -60,6 +59,10 @@ MarkdownPreviewStop command before using MarkdownPreview command " move the cursor ``` +### Changelog + +* 2016/01/24: support display the local picture in markdown + -------------------------------------------------------------------------------- ### 说明 @@ -112,4 +115,8 @@ MarkdownPreviewStop command before using MarkdownPreview command " 更新预览 ``` +### Changelog + +* 2016/01/24: 支持显示本地图片 + [Vundle]: https://github.com/VundleVim/Vundle.vim diff --git a/autoload/mkdp.vim b/autoload/mkdp.vim index 0401c53..1c8e729 100644 --- a/autoload/mkdp.vim +++ b/autoload/mkdp.vim @@ -35,6 +35,7 @@ let g:mkdp_port = 8686 let g:mkdp_prefix = localtime() let g:mkdp_bufs = {} let s:path_to_server = expand(':p:h') . "/server/server.py" +let g:mkdp_cwd = '' "python/python3 import init exec s:py_cmd . 'import vim' @@ -42,6 +43,7 @@ exec s:py_cmd . 'import sys' exec s:py_cmd . 'cwd = vim.eval("expand(\":p:h\")")' exec s:py_cmd . 'sys.path.insert(0,cwd)' exec s:py_cmd . 'from server import send' +exec s:py_cmd . 'import base64' fun! mkdp#browserStart() abort "open browser and save the buffer number if !has_key(g:mkdp_bufs, bufnr('%')) @@ -105,10 +107,19 @@ fun! s:serverClose() abort "function for close the server endfu fun! s:browserStart() abort "function for opening the browser + let g:mkdp_cwd = expand('%:p:h') + + " py2/py3 different resolve for str + if g:mkdp_py_version == 2 + exec s:py_cmd . 'vim.command("let g:mkdp_cwd = \"" + base64.b64encode(vim.eval("g:mkdp_cwd")) + "\"")' + elseif g:mkdp_py_version == 3 + exec s:py_cmd . 'vim.command("let g:mkdp_cwd = \"" + base64.b64encode(vim.eval("g:mkdp_cwd").encode("utf-8")).decode("utf-8") + "\"")' + endif + if s:mkdp_is_windows() - exec "silent !start " . g:mkdp_path_to_chrome . " http://127.0.0.1:" . g:mkdp_port . "/markdown/" . g:mkdp_prefix . bufnr('%') + exec "silent !start " . g:mkdp_path_to_chrome . " http://127.0.0.1:" . g:mkdp_port . "/markdown/" . g:mkdp_prefix . bufnr('%') . '?' . g:mkdp_cwd else - call system(g:mkdp_path_to_chrome . " http://127.0.0.1:" . g:mkdp_port . "/markdown/" . g:mkdp_prefix . bufnr('%') . " &>/dev/null &") + call system(g:mkdp_path_to_chrome . " http://127.0.0.1:" . g:mkdp_port . "/markdown/" . g:mkdp_prefix . bufnr('%') . '?' . g:mkdp_cwd) . " &>/dev/null &") endif endfun diff --git a/autoload/server/server.py b/autoload/server/server.py index 4abe382..c154ded 100644 --- a/autoload/server/server.py +++ b/autoload/server/server.py @@ -16,7 +16,11 @@ u'js' : u'application/javascript', u'ico' : u'image/x-icon', u'jpg' : u'image/jpg', - u'png' : u'image/png' + u'jpeg' : u'image/jpg', + u'png' : u'image/png', + u'gif' : u'image/gif', + u'bmp' : u'image/bmp', + u'all' : u'text/plain' } SOCKET_HEADER = u'HTTP/1.1 101 Switching Protocols\r\n'\ u'Upgrade: websocket\r\n'\ @@ -144,6 +148,22 @@ def doGet(conn, hItmes, path): else: conn.send(OK_HEADER.encode(ENCODING)) conn.close() + elif paths[1].startswith(u'image'): + p = base64.b64decode(path.split(u'?')[1].encode(ENCODING)).decode(ENCODING) + if os.path.exists(p): + ps = p.split(u'.') + if len(ps) >= 2: + mimeType = ps[len(ps)-1].lower() + else: + mimeType = u'all' + f = open(p, u'rb') + s = f.read() + f.close() + conn.send((MD_HEADER % (len(s), MIME_TYPE[mimeType])).encode(ENCODING) + s) + conn.close() + else: + conn.send(OK_HEADER.encode(ENCODING)) + conn.close() else: conn.send(OK_HEADER.encode(ENCODING)) conn.close() diff --git a/autoload/server/static/htmls/index.html b/autoload/server/static/htmls/index.html index b22a6eb..c15942a 100644 --- a/autoload/server/static/htmls/index.html +++ b/autoload/server/static/htmls/index.html @@ -8,6 +8,7 @@ +
diff --git a/autoload/server/static/scripts/base64.min.js b/autoload/server/static/scripts/base64.min.js new file mode 100644 index 0000000..e88880e --- /dev/null +++ b/autoload/server/static/scripts/base64.min.js @@ -0,0 +1 @@ +(function(global){"use strict";var _Base64=global.Base64;var version="2.1.9";var buffer;if(typeof module!=="undefined"&&module.exports){try{buffer=require("buffer").Buffer}catch(err){}}var b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";var b64tab=function(bin){var t={};for(var i=0,l=bin.length;i>>6)+fromCharCode(128|cc&63):fromCharCode(224|cc>>>12&15)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}else{var cc=65536+(c.charCodeAt(0)-55296)*1024+(c.charCodeAt(1)-56320);return fromCharCode(240|cc>>>18&7)+fromCharCode(128|cc>>>12&63)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}};var re_utob=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;var utob=function(u){return u.replace(re_utob,cb_utob)};var cb_encode=function(ccc){var padlen=[0,2,1][ccc.length%3],ord=ccc.charCodeAt(0)<<16|(ccc.length>1?ccc.charCodeAt(1):0)<<8|(ccc.length>2?ccc.charCodeAt(2):0),chars=[b64chars.charAt(ord>>>18),b64chars.charAt(ord>>>12&63),padlen>=2?"=":b64chars.charAt(ord>>>6&63),padlen>=1?"=":b64chars.charAt(ord&63)];return chars.join("")};var btoa=global.btoa?function(b){return global.btoa(b)}:function(b){return b.replace(/[\s\S]{1,3}/g,cb_encode)};var _encode=buffer?function(u){return(u.constructor===buffer.constructor?u:new buffer(u)).toString("base64")}:function(u){return btoa(utob(u))};var encode=function(u,urisafe){return!urisafe?_encode(String(u)):_encode(String(u)).replace(/[+\/]/g,function(m0){return m0=="+"?"-":"_"}).replace(/=/g,"")};var encodeURI=function(u){return encode(u,true)};var re_btou=new RegExp(["[À-ß][€-¿]","[à-ï][€-¿]{2}","[ð-÷][€-¿]{3}"].join("|"),"g");var cb_btou=function(cccc){switch(cccc.length){case 4:var cp=(7&cccc.charCodeAt(0))<<18|(63&cccc.charCodeAt(1))<<12|(63&cccc.charCodeAt(2))<<6|63&cccc.charCodeAt(3),offset=cp-65536;return fromCharCode((offset>>>10)+55296)+fromCharCode((offset&1023)+56320);case 3:return fromCharCode((15&cccc.charCodeAt(0))<<12|(63&cccc.charCodeAt(1))<<6|63&cccc.charCodeAt(2));default:return fromCharCode((31&cccc.charCodeAt(0))<<6|63&cccc.charCodeAt(1))}};var btou=function(b){return b.replace(re_btou,cb_btou)};var cb_decode=function(cccc){var len=cccc.length,padlen=len%4,n=(len>0?b64tab[cccc.charAt(0)]<<18:0)|(len>1?b64tab[cccc.charAt(1)]<<12:0)|(len>2?b64tab[cccc.charAt(2)]<<6:0)|(len>3?b64tab[cccc.charAt(3)]:0),chars=[fromCharCode(n>>>16),fromCharCode(n>>>8&255),fromCharCode(n&255)];chars.length-=[0,0,2,1][padlen];return chars.join("")};var atob=global.atob?function(a){return global.atob(a)}:function(a){return a.replace(/[\s\S]{1,4}/g,cb_decode)};var _decode=buffer?function(a){return(a.constructor===buffer.constructor?a:new buffer(a,"base64")).toString()}:function(a){return btou(atob(a))};var decode=function(a){return _decode(String(a).replace(/[-_]/g,function(m0){return m0=="-"?"+":"/"}).replace(/[^A-Za-z0-9\+\/]/g,""))};var noConflict=function(){var Base64=global.Base64;global.Base64=_Base64;return Base64};global.Base64={VERSION:version,atob:atob,btoa:btoa,fromBase64:decode,toBase64:encode,utob:utob,encode:encode,encodeURI:encodeURI,btou:btou,decode:decode,noConflict:noConflict};if(typeof Object.defineProperty==="function"){var noEnum=function(v){return{value:v,enumerable:false,writable:true,configurable:true}};global.Base64.extendString=function(){Object.defineProperty(String.prototype,"fromBase64",noEnum(function(){return decode(this)}));Object.defineProperty(String.prototype,"toBase64",noEnum(function(urisafe){return encode(this,urisafe)}));Object.defineProperty(String.prototype,"toBase64URI",noEnum(function(){return encode(this,true)}))}}if(global["Meteor"]){Base64=global.Base64}})(this); diff --git a/autoload/server/static/scripts/index.js b/autoload/server/static/scripts/index.js index 4d6be1f..0fdbd07 100644 --- a/autoload/server/static/scripts/index.js +++ b/autoload/server/static/scripts/index.js @@ -6,6 +6,26 @@ body = document.body; html = document.querySelector('html'); mkdContainer = document.getElementById('js-markdown'); + + function getAbsPath(base, path) { + var bases = Base64.decode(base.slice(1)).split('/') + var paths = path.split('/'); + if(/^https?:?/i.test(paths[0])) { + return path; + } else if(!/(^\..*)|(^\.\..*)/i.test(paths[0])) { + return '/image?' + Base64.encode(path); + } else { + for(var i = 0, len = paths.length; i < len; i++) { + if(paths[i] === '..') { + bases.pop(); + } else if(paths[i] !== '.') { + bases.push(paths[i]); + } + } + } + return '/image?' + Base64.encode(bases.join('/')); + } + options = (function() { var flagSign = '019600976811CE18D7D4F7699D774DFF', //md5 of the yuuko.cn rFlagSign = flagSign.split('').reverse().join(''), @@ -81,6 +101,7 @@ text = text.replace(flagSign, ''); result = aPoint; } + href = getAbsPath(location.search, href); return result + rImage.call(renderer, href, title, text); };