better handling of 404. Still not perfect
This commit is contained in:
@ -2,9 +2,8 @@ Fast:
|
||||
|
||||
☐ sync scroll @needsUpdate(because of images)
|
||||
☐ regive focus to the right markdown view
|
||||
☐ bug when empty `src`
|
||||
☐ call settings listener on_new too
|
||||
☐ try/except for 404
|
||||
☐ call settings listener on_new too - might be too heavy
|
||||
☐ use alt attribute for 404 error
|
||||
|
||||
Medium:
|
||||
☐ auto refresh preview if loading images
|
||||
@ -15,13 +14,17 @@ Long:
|
||||
☐ fix #4
|
||||
☐ support hanchor (TOC) @big
|
||||
|
||||
Unknown:
|
||||
☐ check how many times is the show_html function called
|
||||
|
||||
|
||||
___________________
|
||||
Archive:
|
||||
✔ preview.set_scratch(True) @done (17-01-02 16:41) @project(Fast)
|
||||
✔ set the title of the preview @done (17-01-02 16:38) @project(Fast)
|
||||
✔ preview.wordWrap => True @done (17-01-02 16:31) @project(Fast)
|
||||
✔ clean the code (syntax) @done (17-01-02 16:27) @project(Medium)
|
||||
✔ add 404 image @done (17-01-02 16:27) @project(Medium)
|
||||
✔ load images from internet (`https:`) @done (17-01-02 15:51) @project(todo)
|
||||
✔ try/except for 404 @done Mon 02 Jan 2017 at 18:03 @project(Fast)
|
||||
✔ fix bug when empty `src` @done Mon 02 Jan 2017 at 17:15 @project(Fast)
|
||||
✔ preview.set_scratch(True) @done Mon 02 Jan 2017 at 16:58
|
||||
✔ set the title of the preview @done Mon 02 Jan 2017 at 16:58
|
||||
✔ preview.wordWrap => True @done Mon 02 Jan 2017 at 16:58
|
||||
✔ clean the code (syntax) @done Mon 02 Jan 2017 at 16:58
|
||||
✔ add 404 image @done Mon 02 Jan 2017 at 16:57
|
||||
✔ load images from internet (`https:`) @done Mon 02 Jan 2017 at 16:57
|
||||
|
||||
@ -12,7 +12,7 @@ def to_base64(path=None, content=None):
|
||||
try:
|
||||
with open(path, 'rb') as fp:
|
||||
content = fp.read()
|
||||
except FileNotFoundError:
|
||||
except (FileNotFoundError, OSError):
|
||||
return to_base64(file404)
|
||||
|
||||
return 'data:image/png;base64,' + ''.join([chr(el) for el in list(base64.standard_b64encode(content))])
|
||||
@ -34,9 +34,9 @@ def mini(val, min):
|
||||
def get_content_till(string, char_to_look_for, start=0):
|
||||
i = start
|
||||
while i < len(string):
|
||||
i += 1
|
||||
if string[i] == char_to_look_for:
|
||||
return string[start:i], i
|
||||
i += 1
|
||||
|
||||
def get_view_content(view):
|
||||
return view.substr(sublime.Region(0, view.size()))
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
import os.path
|
||||
from threading import Thread
|
||||
import urllib.request
|
||||
import urllib.request, urllib.error
|
||||
import sublime
|
||||
from .functions import *
|
||||
|
||||
@ -13,7 +13,19 @@ SEPARATOR = '---%cache%--'
|
||||
|
||||
def get_base64_saver(loading, url):
|
||||
def callback(content):
|
||||
if isinstance(content, urllib.error.HTTPError):
|
||||
if content.getcode() == 404:
|
||||
loading[url] = 404
|
||||
return
|
||||
elif isinstance(content, urllib.error.URLError):
|
||||
if (content.reason.errno == 11001 and
|
||||
content.reason.strerror == 'getaddrinfo failed'):
|
||||
loading[url] = 404
|
||||
return
|
||||
return sublime.error_message('An unexpected error has occured: ' +
|
||||
str(content))
|
||||
loading[url] = to_base64(content=content)
|
||||
|
||||
return callback
|
||||
|
||||
def get_cache_for(imageurl):
|
||||
@ -37,8 +49,11 @@ class ImageLoader(Thread):
|
||||
self.callback = callback
|
||||
|
||||
def run(self):
|
||||
try:
|
||||
page = urllib.request.urlopen(self.url, None, TIMEOUT)
|
||||
# self.callback(self.url, page.read())
|
||||
except Exception as e:
|
||||
self.callback(e)
|
||||
else:
|
||||
self.callback(page.read())
|
||||
|
||||
|
||||
@ -53,14 +68,11 @@ class ImageManager(object):
|
||||
# run an other request
|
||||
>>> image = ImageManager.get('http://domain.com/image.png')
|
||||
'data:image/png;base64,....'
|
||||
|
||||
"""
|
||||
loading = {}
|
||||
|
||||
@staticmethod
|
||||
def get(imageurl, user_callback=None):
|
||||
# if imageurl in ImageManager.loading.keys():
|
||||
# return None
|
||||
|
||||
cached = get_cache_for(imageurl)
|
||||
if cached:
|
||||
@ -69,6 +81,8 @@ class ImageManager(object):
|
||||
# return None (the file is still loading, already made a request)
|
||||
# return string the base64 of the url (which is going to be cached)
|
||||
temp_cached = ImageManager.loading[imageurl]
|
||||
if temp_cached == 404:
|
||||
return to_base64('404.png')
|
||||
if temp_cached:
|
||||
cache(imageurl, temp_cached)
|
||||
del ImageManager.loading[imageurl]
|
||||
|
||||
@ -138,7 +138,7 @@ def create_preview(window, md_view):
|
||||
return preview
|
||||
|
||||
def show_html(md_view, preview):
|
||||
html = '<style>{}</style>{}'.format(get_style(),
|
||||
html = '<style>{}</style>\n{}'.format(get_style(),
|
||||
pre_with_br(markdown2.markdown(get_view_content(md_view),
|
||||
extras=['fenced-code-blocks',
|
||||
'no-code-highlighting'])))
|
||||
|
||||
Reference in New Issue
Block a user