KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

diff kitten: Report errors converting images

Browse Source
This commit is contained in:
Kovid Goyal 2018-05-20 15:01:25 +05:30
parent 2a9dc23c61
commit fa3e173c18
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kittens/diff/collect.py
View File

@ -142,7 +142,7 @@ def is_image(path):
@lru_cache(maxsize=1024) @lru_cache(maxsize=1024)
def data_for_path(path): def data_for_path(path):
ans = raw_data_for_path(path) ans = raw_data_for_path(path)
if not is_image(path): if not is_image(path) and not os.path.samefile(path, os.devnull):
try: try:
ans = ans.decode('utf-8') ans = ans.decode('utf-8')
except UnicodeDecodeError: except UnicodeDecodeError:

6
kittens/tui/images.py
View File

@ -230,11 +230,7 @@ class ImageManager:
self.handler.cmd.gr_command(cmd) self.handler.cmd.gr_command(cmd)
def convert_image(self, path, available_width, available_height, image_data, scale_up=False): def convert_image(self, path, available_width, available_height, image_data, scale_up=False):
try: rgba_path, width, height = convert(path, image_data, available_width, available_height, scale_up, tdir=self.tdir)
rgba_path, width, height = convert(path, image_data, available_width, available_height, scale_up, tdir=self.tdir)
except ValueError:
rgba_path = None
width = height = 0
return rgba_path, width, height return rgba_path, width, height
def transmit_image(self, image_data, image_id, rgba_path, width, height): def transmit_image(self, image_data, image_id, rgba_path, width, height):