about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2017-01-23 19:35:13 +0100
committernfnty <git@nfnty.se>2017-01-23 19:35:13 +0100
commitcc358f9a9e4c3820aadea8b72ab170f2c09300b3 (patch)
treea8bfa6034ffdd227e33c315f58ce9c398101c0ce
parent2d97d36745761a792fa4d8c340255d11503468bd (diff)
downloadranger-cc358f9a9e4c3820aadea8b72ab170f2c09300b3.tar.gz
core.actions: Reduce `get_preview()` nesting
-rw-r--r--ranger/core/actions.py241
1 files changed, 123 insertions, 118 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 137e2c1f..2d5f2da0 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -940,136 +940,141 @@ class Actions(  # pylint: disable=too-many-instance-attributes,too-many-public-m
         if not path or not os.path.exists(path):
             return None
 
-        if self.settings.preview_script and self.settings.use_preview_script:
-            # self.previews is a 2 dimensional dict:
-            # self.previews['/tmp/foo.jpg'][(80, 24)] = "the content..."
-            # self.previews['/tmp/foo.jpg']['loading'] = False
-            # A -1 in tuples means "any"; (80, -1) = wid. of 80 and any hei.
-            # The key 'foundpreview' is added later. Values in (True, False)
-            # XXX: Previews can break when collapse_preview is on and the
-            # preview column is popping out as you move the cursor on e.g. a
-            # PDF file.
+        if not self.settings.preview_script or not self.settings.use_preview_script:
             try:
-                data = self.previews[path]
-            except KeyError:
-                data = self.previews[path] = {'loading': False}
-            else:
-                if data['loading']:
-                    return None
-
-            found = data.get(
-                (-1, -1), data.get(
-                    (width, -1), data.get(
-                        (-1, height), data.get(
-                            (width, height), False
-                        )
+                return codecs.open(path, 'r', errors='ignore')
+            except OSError:
+                return None
+
+        # self.previews is a 2 dimensional dict:
+        # self.previews['/tmp/foo.jpg'][(80, 24)] = "the content..."
+        # self.previews['/tmp/foo.jpg']['loading'] = False
+        # A -1 in tuples means "any"; (80, -1) = wid. of 80 and any hei.
+        # The key 'foundpreview' is added later. Values in (True, False)
+        # XXX: Previews can break when collapse_preview is on and the
+        # preview column is popping out as you move the cursor on e.g. a
+        # PDF file.
+        try:
+            data = self.previews[path]
+        except KeyError:
+            data = self.previews[path] = {'loading': False}
+        else:
+            if data['loading']:
+                return None
+
+        found = data.get(
+            (-1, -1), data.get(
+                (width, -1), data.get(
+                    (-1, height), data.get(
+                        (width, height), False
                     )
                 )
             )
-            if found is False:
-                try:
-                    stat_ = os.stat(self.settings.preview_script)
-                except OSError:
-                    self.fm.notify(
-                        "Preview Script `%s' doesn't exist!" % self.settings.preview_script,
-                        bad=True,
-                    )
-                    return None
+        )
+        if found is not False:
+            return found
 
-                if not stat_.st_mode & S_IEXEC:
-                    self.fm.notify(
-                        "Preview Script `%s' is not executable!" % self.settings.preview_script,
-                        bad=True,
-                    )
-                    return None
+        try:
+            stat_ = os.stat(self.settings.preview_script)
+        except OSError:
+            self.fm.notify(
+                "Preview Script `%s' doesn't exist!" % self.settings.preview_script,
+                bad=True,
+            )
+            return None
 
-                data['loading'] = True
+        if not stat_.st_mode & S_IEXEC:
+            self.fm.notify(
+                "Preview Script `%s' is not executable!" % self.settings.preview_script,
+                bad=True,
+            )
+            return None
 
-                if 'directimagepreview' in data:
-                    data['foundpreview'] = True
-                    data['imagepreview'] = True
-                    pager.set_image(path)
-                    data['loading'] = False
-                    return path
+        data['loading'] = True
+
+        if 'directimagepreview' in data:
+            data['foundpreview'] = True
+            data['imagepreview'] = True
+            pager.set_image(path)
+            data['loading'] = False
+            return path
+
+        cacheimg = os.path.join(ranger.args.cachedir, self.sha1_encode(path))
+        if os.path.isfile(cacheimg) and \
+                os.path.getmtime(cacheimg) > os.path.getmtime(path):
+            data['foundpreview'] = True
+            data['imagepreview'] = True
+            pager.set_image(cacheimg)
+            data['loading'] = False
+            return cacheimg
+
+        def on_after(signal):
+            rcode = signal.process.poll()
+            content = signal.loader.stdout_buffer
+            data['foundpreview'] = True
+
+            if rcode == 0:
+                data[(width, height)] = content
+            elif rcode == 3:
+                data[(-1, height)] = content
+            elif rcode == 4:
+                data[(width, -1)] = content
+            elif rcode == 5:
+                data[(-1, -1)] = content
+            elif rcode == 6:
+                data['imagepreview'] = True
+            elif rcode == 7:
+                data['directimagepreview'] = True
+            elif rcode == 1:
+                data[(-1, -1)] = None
+                data['foundpreview'] = False
+            elif rcode == 2:
+                fobj = codecs.open(path, 'r', errors='ignore')
+                try:
+                    data[(-1, -1)] = fobj.read(1024 * 32)
+                except UnicodeDecodeError:
+                    fobj.close()
+                    fobj = codecs.open(path, 'r', encoding='latin-1', errors='ignore')
+                    data[(-1, -1)] = fobj.read(1024 * 32)
+                fobj.close()
+            else:
+                data[(-1, -1)] = None
 
-                cacheimg = os.path.join(ranger.args.cachedir, self.sha1_encode(path))
-                if os.path.isfile(cacheimg) and \
-                        os.path.getmtime(cacheimg) > os.path.getmtime(path):
-                    data['foundpreview'] = True
-                    data['imagepreview'] = True
+            if self.thisfile and self.thisfile.realpath == path:
+                self.ui.browser.need_redraw = True
+
+            data['loading'] = False
+
+            pager = self.ui.get_pager()
+            if self.thisfile and self.thisfile.is_file:
+                if 'imagepreview' in data:
                     pager.set_image(cacheimg)
-                    data['loading'] = False
                     return cacheimg
+                elif 'directimagepreview' in data:
+                    pager.set_image(path)
+                    return path
+                else:
+                    pager.set_source(self.thisfile.get_preview_source(
+                        pager.wid, pager.hei))
 
-                loadable = CommandLoader(
-                    args=[self.settings.preview_script, path, str(width), str(height),
-                          cacheimg, str(self.settings.preview_images)],
-                    read=True,
-                    silent=True,
-                    descr="Getting preview of %s" % path,
-                )
-
-                def on_after(signal):
-                    rcode = signal.process.poll()
-                    content = signal.loader.stdout_buffer
-                    data['foundpreview'] = True
-                    if rcode == 0:
-                        data[(width, height)] = content
-                    elif rcode == 3:
-                        data[(-1, height)] = content
-                    elif rcode == 4:
-                        data[(width, -1)] = content
-                    elif rcode == 5:
-                        data[(-1, -1)] = content
-                    elif rcode == 6:
-                        data['imagepreview'] = True
-                    elif rcode == 7:
-                        data['directimagepreview'] = True
-                    elif rcode == 1:
-                        data[(-1, -1)] = None
-                        data['foundpreview'] = False
-                    elif rcode == 2:
-                        fobj = codecs.open(path, 'r', errors='ignore')
-                        try:
-                            data[(-1, -1)] = fobj.read(1024 * 32)
-                        except UnicodeDecodeError:
-                            fobj.close()
-                            fobj = codecs.open(path, 'r', encoding='latin-1', errors='ignore')
-                            data[(-1, -1)] = fobj.read(1024 * 32)
-                        fobj.close()
-                    else:
-                        data[(-1, -1)] = None
-                    if self.thisfile and self.thisfile.realpath == path:
-                        self.ui.browser.need_redraw = True
-                    data['loading'] = False
-                    pager = self.ui.get_pager()
-                    if self.thisfile and self.thisfile.is_file:
-                        if 'imagepreview' in data:
-                            pager.set_image(cacheimg)
-                            return cacheimg
-                        elif 'directimagepreview' in data:
-                            pager.set_image(path)
-                            return path
-                        else:
-                            pager.set_source(self.thisfile.get_preview_source(
-                                pager.wid, pager.hei))
-
-                def on_destroy(signal):  # pylint: disable=unused-argument
-                    try:
-                        del self.previews[path]
-                    except KeyError:
-                        pass
-                loadable.signal_bind('after', on_after)
-                loadable.signal_bind('destroy', on_destroy)
-                self.loader.add(loadable)
-                return None
-            else:
-                return found
-        else:
+        def on_destroy(signal):  # pylint: disable=unused-argument
             try:
-                return codecs.open(path, 'r', errors='ignore')
-            except OSError:
-                return None
+                del self.previews[path]
+            except KeyError:
+                pass
+
+        loadable = CommandLoader(
+            args=[self.settings.preview_script, path, str(width), str(height),
+                  cacheimg, str(self.settings.preview_images)],
+            read=True,
+            silent=True,
+            descr="Getting preview of %s" % path,
+        )
+        loadable.signal_bind('after', on_after)
+        loadable.signal_bind('destroy', on_destroy)
+        self.loader.add(loadable)
+
+        return None
 
     # --------------------------
     # -- Tabs
> } return true; } if ('onhashchange' in window) { window.onhashchange = JumpToLine; } --> </script> </head> <body onload='JumpToLine();'> <a href='https://github.com/akkartik/mu/blob/main/linux/ex10.subx'>https://github.com/akkartik/mu/blob/main/linux/ex10.subx</a> <pre id='vimCodeElement'> <span id="L1" class="LineNr"> 1 </span><span class="subxComment"># String comparison: return 1 iff the two args passed in at the commandline are equal.</span> <span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span> <span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run:</span> <span id="L4" class="LineNr"> 4 </span><span class="subxComment"># $ bootstrap/bootstrap translate ex10.subx -o ex10</span> <span id="L5" class="LineNr"> 5 </span><span class="subxComment"># $ bootstrap/bootstrap run ex10 abc abd</span> <span id="L6" class="LineNr"> 6 </span><span class="subxComment"># Expected result:</span> <span id="L7" class="LineNr"> 7 </span><span class="subxComment"># $ echo $?</span> <span id="L8" class="LineNr"> 8 </span><span class="subxComment"># 0 # false</span> <span id="L9" class="LineNr"> 9 </span> <span id="L10" class="LineNr">10 </span>== code <span id="L11" class="LineNr">11 </span><span class="subxComment"># instruction effective address register displacement immediate</span> <span id="L12" class="LineNr">12 </span><span class="subxS1Comment"># . op subop mod rm32 base index scale r32</span> <span id="L13" class="LineNr">13 </span><span class="subxS1Comment"># . 1-3 bytes 3 bits 2 bits 3 bits 3 bits 3 bits 2 bits 2 bits 0/1/2/4 bytes 0/1/2/4 bytes</span> <span id="L14" class="LineNr">14 </span> <span id="L15" class="LineNr">15 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># return argv-equal(argv[1], argv[2])</span> <span id="L16" class="LineNr">16 </span><span class="subxComment"># At the start of a SubX program:</span> <span id="L17" class="LineNr">17 </span><span class="subxComment"># argc: *esp</span> <span id="L18" class="LineNr">18 </span><span class="subxComment"># argv[0]: *(esp+4)</span> <span id="L19" class="LineNr">19 </span><span class="subxComment"># argv[1]: *(esp+8)</span> <span id="L20" class="LineNr">20 </span><span class="subxComment"># ...</span> <span id="L21" class="LineNr">21 </span> <span class="subxS1Comment"># . prologue</span> <span id="L22" class="LineNr">22 </span> 89/copy 3/mod/direct 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/r32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy esp to ebp</span> <span id="L23" class="LineNr">23 </span> <span class="subxComment"># argv-equal(argv[1], argv[2])</span> <span id="L24" class="LineNr">24 </span> <span class="subxS2Comment"># . . push argv[2]</span> <span id="L25" class="LineNr">25 </span> ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0xc/disp8 <span class="Normal"> . </span> <span class="subxComment"># push *(ebp+12)</span> <span id="L26" class="LineNr">26 </span> <span class="subxS2Comment"># . . push argv[1]</span> <span id="L27" class="LineNr">27 </span> ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># push *(ebp+8)</span> <span id="L28" class="LineNr">28 </span> <span class="subxS2Comment"># . . call</span> <span id="L29" class="LineNr">29 </span> e8/call <a href='ex10.subx.html#L36'>argv-equal</a>/disp32 <span id="L30" class="LineNr">30 </span> <span class="subxComment"># exit(eax)</span> <span id="L31" class="LineNr">31 </span> 89/copy 3/mod/direct 3/rm32/ebx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0/r32/eax <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy eax to ebx</span> <span id="L32" class="LineNr">32 </span> e8/call <a href='000init.subx.html#L18'>syscall_exit</a>/disp32 <span id="L33" class="LineNr">33 </span> <span id="L34" class="LineNr">34 </span><span class="subxComment"># compare two null-terminated ascii strings</span> <span id="L35" class="LineNr">35 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span> <span id="L36" class="LineNr">36 </span><span class="subxFunction">argv-equal</span>: <span class="subxComment"># (s1, s2): null-terminated ascii strings -&gt; eax: boolean</span> <span id="L37" class="LineNr">37 </span> <span class="subxComment"># initialize s1 (ecx) and s2 (edx)</span> <span id="L38" class="LineNr">38 </span> 8b/copy 1/mod/*+disp8 4/rm32/sib 4/base/esp 4/index/none <span class="Normal"> . </span> 1/r32/ecx 4/disp8 <span class="Normal"> . </span> <span class="subxComment"># copy *(esp+4) to ecx</span> <span id="L39" class="LineNr">39 </span> 8b/copy 1/mod/*+disp8 4/rm32/sib 4/base/esp 4/index/none <span class="Normal"> . </span> 2/r32/edx 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># copy *(esp+8) to edx</span> <span id="L40" class="LineNr">40 </span><span class="Constant">$argv-equal:loop</span>: <span id="L41" class="LineNr">41 </span> <span class="subxComment"># c1/eax, c2/ebx = *s1, *s2</span> <span id="L42" class="LineNr">42 </span> b8/copy-to-eax 0/imm32 <span id="L43" class="LineNr">43 </span> 8a/copy-byte 0/mod/indirect 1/rm32/ecx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0/r32/AL <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy byte at *ecx to AL</span> <span id="L44" class="LineNr">44 </span> bb/copy-to-ebx 0/imm32 <span id="L45" class="LineNr">45 </span> 8a/copy-byte 0/mod/indirect 2/rm32/edx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 3/r32/BL <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy byte at *edx to BL</span> <span id="L46" class="LineNr">46 </span> <span class="subxComment"># if (c1 == 0) break</span> <span id="L47" class="LineNr">47 </span> 3d/compare-eax-and 0/imm32/null <span id="L48" class="LineNr">48 </span> 74/jump-if-= $argv-equal:<span class="Constant">break</span>/disp8 <span id="L49" class="LineNr">49 </span> <span class="subxComment"># if (c1 != c2) return false</span> <span id="L50" class="LineNr">50 </span> 39/compare 3/mod/direct 0/rm32/eax <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 3/r32/ebx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># compare eax and ebx</span> <span id="L51" class="LineNr">51 </span> 75/jump-if-!= $argv-equal:false/disp8 <span id="L52" class="LineNr">52 </span> <span class="subxComment"># ++s1, ++s2</span> <span id="L53" class="LineNr">53 </span> 41/increment-ecx <span id="L54" class="LineNr">54 </span> 42/increment-edx <span id="L55" class="LineNr">55 </span> <span class="subxComment"># end while</span> <span id="L56" class="LineNr">56 </span> eb/jump $argv-equal:<span class="Constant">loop</span>/disp8 <span id="L57" class="LineNr">57 </span><span class="Constant">$argv-equal:break</span>: <span id="L58" class="LineNr">58 </span> <span class="subxComment"># if (c2 == 0) return true</span> <span id="L59" class="LineNr">59 </span> 81 7/subop/compare 3/mod/direct 3/rm32/ebx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0/imm32/null <span class="subxComment"># compare ebx</span> <span id="L60" class="LineNr">60 </span> 75/jump-if-!= $argv-equal:false/disp8 <span id="L61" class="LineNr">61 </span><span class="Constant">$argv-equal:success</span>: <span id="L62" class="LineNr">62 </span> b8/copy-to-eax 1/imm32 <span id="L63" class="LineNr">63 </span> c3/return <span id="L64" class="LineNr">64 </span> <span class="subxComment"># return false</span> <span id="L65" class="LineNr">65 </span><span class="Constant">$argv-equal:false</span>: <span id="L66" class="LineNr">66 </span> b8/copy-to-eax 0/imm32 <span id="L67" class="LineNr">67 </span> c3/return <span id="L68" class="LineNr">68 </span> <span id="L69" class="LineNr">69 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span> </pre> </body> </html> <!-- vim: set foldmethod=manual : -->