From d012468d69a53fe582b3a45f18a6aedb304defb3 Mon Sep 17 00:00:00 2001 From: David Barnett Date: Wed, 19 May 2010 23:27:31 -0400 Subject: Use Applications.either even with only one option for dependency checking; fix broken eog reference (to 'eye_of_gnome') --- ranger/defaults/apps.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py index 026ff271..44e209a1 100644 --- a/ranger/defaults/apps.py +++ b/ranger/defaults/apps.py @@ -55,29 +55,29 @@ class CustomApplications(Applications): f = c.file if f.basename.lower() == 'makefile': - return self.app_make(c) + return self.either(c, 'make') if f.extension is not None: if f.extension in ('pdf', ): c.flags += 'd' return self.either(c, 'evince', 'zathura', 'apvlv') if f.extension in ('xml', ): - return self.app_editor(c) + return self.either(c, 'editor') if f.extension in ('html', 'htm', 'xhtml'): return self.either(c, 'firefox', 'opera', 'elinks') if f.extension in ('swf', ): return self.either(c, 'firefox', 'opera') if f.extension == 'nes': - return self.app_fceux(c) + return self.either(c, 'fceux') if f.extension in ('swc', 'smc'): - return self.app_zsnes(c) + return self.either(c, 'zsnes') if f.mimetype is not None: if INTERPRETED_LANGUAGES.match(f.mimetype): - return self.app_edit_or_run(c) + return self.either(c, 'edit_or_run') if f.container: - return self.app_aunpack(c) + return self.either(c, 'aunpack') if f.video or f.audio: if f.video: @@ -85,10 +85,10 @@ class CustomApplications(Applications): return self.either(c, 'mplayer', 'totem') if f.image: - return self.either(c, 'feh', 'eye_of_gnome', 'mirage') + return self.either(c, 'feh', 'eog', 'mirage') if f.document or f.filetype.startswith('text'): - return self.app_editor(c) + return self.either(c, 'editor') # ----------------------------------------- application definitions @@ -140,8 +140,8 @@ class CustomApplications(Applications): if c.mode in arg: return tup('feh', arg[c.mode], c.file.path) - if c.mode is 4: - return self.app_gimp(c) + if c.mode is 4: # Note: mode 4 wouldn't need to depend on 'feh' + return self.either(c, 'gimp') if c.mode is 11: if len(c.files) > 1: return tup('feh', *c) -- cgit 1.4.1-2-gfad0