about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'py-version-checks'toonn2020-07-0513-37/+34
|\ \ \ \ \
| * | | | | Factor out python 3 version checkingtoonn2020-06-2912-37/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We check whether we're running python 2 or 3 in many places. In some places we do more specific version checks but with the new `PY3` constant modeled after `six` this code should be slightly more readable.
| * | | | | Factor PY3 constant out into ranger moduletoonn2020-06-293-5/+5
| | | | | |
* | | | | | Merge branch 'rc_macro_error'toonn2020-07-052-68/+121
|\ \ \ \ \ \
| * | | | | | Add MacroDicttoonn2019-09-272-67/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Macros are resolved for set commands. A contributor wanted to add a setting for a date format string to be used in ranger's status bar. The string they tried happened to include `%d` which is a valid ranger macro for the name of `thisdir`. This attribute is not yet defined when ranger is reading `rc.conf` and this uncaught exception would crash ranger. To work around this we need to catch `AttributeError`s for values that might not exist yet. To avoid the repetition that'd come with all these try-catch statements that behavior has been encapsulated in a new MacroDict. This is almost as easy to use as the regular python dictionary used previously. The only difference being that we need to wrap values that might cause problems in a python `lambda`, though it doesn't do any harm to wrap values that can't raise exceptions.
| * | | | | | Catch exceptions when resolving macros in rc.conftoonn2019-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While parsing the settings in `rc.conf` `self.fm.thisfile` doesn't exist yet.
* | | | | | | Merge pull request #1816 from toonn/gifehfehWojciech Siewierski2020-07-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Feh does not handle animated gifs gracefully
| * | | | | | | Feh does not handle animated gifs gracefullytoonn2020-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1814
* | | | | | | | Merge pull request #1847 from toonn/rust-is-textWojciech Siewierski2020-07-051-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add rust to programming languages for rifle
| * | | | | | | | Add rust to programming languages for rifletoonn2020-02-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the Rust extension `.rs` to the list of programming languages to match editor and pager because it is erroneously guessed as being `application/rls-services+xml`.
* | | | | | | | | Merge branch 'cache-hash' [#2019]Wojciech Siewierski2020-07-051-11/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Switch from SHA-1 to SHA-512 for the cachetoonn2020-06-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The performance hit is negligible. File name lengths are usually 255 bytes at minimum (except for FAT, but a SHA-1 digest is truncated too). An attack on the ranger cache based on hash collisions is probably fairly unlikely but preventing it is almost free. This should be merged soon after #1838 because both these PRs change the cache hashes and can therefore cause generation of previews that have been cached before, wasting some disk space.
| * | | | | | | | Get rid of redundant codetoonn2020-06-291-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The python version dependence is gone because we no longer want to hash the path. We've been doubling up `os.path.join` calls for a long time, that's silly, let's just not.
| * | | | | | | | Drop file path from cache hashtoonn2020-06-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we include the device identifier and the inode in cache hashes now we no longer need the path to the file. Files are already more uniquely identified (if the path was reused for another file with an acceptable mtime there used to be a collision). A small benefit is that hardlinked and symlinked files should now only require a single cached preview.
| * | | | | | | | Include mtime in hash rather than comparingtoonn2020-06-291-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing the mtimes of a file and a cached preview or including the mtime in the preview's hash are almost equivalent except this way we don't need to find out the preview's mtime. We include the device identifier and the inode in the hash, this makes sure duplicate filenames don't cause erroneous hits in the cache.
| * | | | | | | | Allow equal mtime for cached previewstoonn2020-02-121-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the use of symlinks to prevent copying files to the cache. Fixes #1837
* | | | | | | | Merge pull request #1824 from toonn/pprime-draw-bookmarksWojciech Siewierski2020-07-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add bookmark drawing to the paste to bookmark map
| * \ \ \ \ \ \ \ Merge branch 'master' into pprime-draw-bookmarksWojciech Siewierski2020-07-0510-71/+80
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Add bookmark drawing to the paste to bookmark maptoonn2020-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neglected to add drawing of bookmarks to the mapping that allows pasting the contents of the copybuffer to a bookmark's path. Brought to my attention by discussion in #1277.
* | | | | | | | | Merge pull request #1870 from toonn/py26-format-fixWojciech Siewierski2020-07-055-19/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Py26 does not support implicit format spec numbering
| * \ \ \ \ \ \ \ \ Merge branch 'master' into py26-format-fixWojciech Siewierski2020-07-052-3/+13
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1961 from toonn/pass-fileWojciech Siewierski2020-07-051-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "ranger <path> can select files""
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into pass-fileWojciech Siewierski2020-07-052-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Revert "Revert "ranger <path> can select files""toonn2020-05-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't reproduce the problems with <Right> and I don't see anything in the commit that could've caused them in the first place tbh. The issue this introduces keeps coming up so I'm verting the original change. Fixes #1655 Fixes #1386 This reverts commit 11549e2c0c73a8a0bb543801af4e134b3e076095.
* | | | | | | | | | | Merge pull request #2013 from toonn/silence-bulkrenameWojciech Siewierski2020-07-051-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Implement passing of flags for :bulkrename
| * | | | | | | | | | Implement passing of flags for :bulkrenametoonn2020-06-231-1/+7
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flags a bulkrename command passed to the command runner were fixed to `w`, which means "wait for an enter keypress." Now it's possible to pass whichever flags you want. Passing any flag overrides the default so if you still want the confirmation you need to explicitly pass `w`. Fixes #2002
| | * | | | | | | | Merge branch 'master' into py26-format-fixWojciech Siewierski2020-07-055-56/+63
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'install-default-py3'toonn2020-06-221-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Default to python3 at install, fall back to pythontoonn2020-06-221-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `python` is supposed to always point to a python 2.x executable and python 2.x is no longer supported by the PSF, we should try to install with `python3` by default and fall back to `python` and then `python2`. Fixes #2006
* | | | | | | | | Merge commit '5f9fc1827934d'toonn2020-05-251-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge PR #1975 adding hide alias for scout (inverted filter)
| * | | | | | | | | add alias for scouthektr2020-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add hide alias for scout. Should work like filter but with inverted results of matching.
* | | | | | | | | | Merge branch 'hektr-pull-1974'toonn2020-05-241-1/+0
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | extra comment is deletedhektr2020-05-241-1/+0
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | a little clean up. Possible values of viewmode are showed in comments above that option, so, it's not needed to make commented duplicate of this option.
* | | | | | | | Merge pull request #1958 from Vifon/setuptoolsWojciech Siewierski2020-05-132-13/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fully migrate from distutils to setuptools
| * | | | | | | Fully migrate from distutils to setuptoolsWojciech Siewierski2020-05-132-13/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Even the Python docs recommend setuptools over using distutils directly.
* | | | | | | Merge branch 'tkukurin-master'toonn2020-03-041-40/+55
|\ \ \ \ \ \ \
| * | | | | | | Drop double setting and prefer basename over splittoonn2020-03-041-4/+2
| | | | | | | |
| * | | | | | | Change approach to multiplexer title renamingtoonn2020-03-021-41/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a couple bugs causing ranger to miss opportunities to restore multiplexer window names in tmux. Fixes #1805
| * | | | | | | Update ui.pyToni Kukurin2020-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix 'FileNotFound' if `screen` is not available
| | * | | | | | Fix redundant whitespace in class definitiontoonn2020-06-271-1/+0
| | | | | | | |
| | * | | | | | Py26 does not support implicit format spec numberingtoonn2020-03-045-19/+26
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As FichteFoll rightly pointed outin #1840, python 2.6 did *not* support implicit format spec numbering for positional arguments. This commit brings the code back in line with our promise that it is compatible with python 2.6. I used the following patterns to grep for occurences: - '"\{\}"' - '"\{:.*\}"' - "'\{\}'" - "'\{:.*\}'"
* | | | | | | Merge remote-tracking branch 'dmarcoux/address-issue-1866'toonn2020-03-032-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refer to the correct environment variable for selecting a theme for batDany Marcoux2020-03-032-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Closes #1866
* | | | | | Merge branch 'xdg-open-option'toonn2020-02-241-1/+1
|\ \ \ \ \ \
| * | | | | | xdg-open is not compatible with the -- conventiontoonn2020-02-241-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes #1853
* | | | | | Merge branch 'emberfade-fix-trash-location'toonn2020-02-233-8/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | doc: change trash locationemberfade2020-02-222-7/+7
| | | | | |
| * | | | | rifle.conf: change fallback trash location emberfade2020-02-221-1/+1
|/ / / / / | | | | | | | | | | | | | | | Change the fallback trash location to use the correct environment variable and ranger's default data directory.
* | | | | Merge branch 'jrwrigh-patch-1'toonn2020-02-082-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clarify that defaults will not be loadedtoonn2020-02-082-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Explicitly state that defaults won't be loaded if a configuration file is present and render the docs.