From 1542e056cafdea174bf1af673807192b25727401 Mon Sep 17 00:00:00 2001 From: gryf Date: Wed, 29 Jan 2025 18:22:46 +0100 Subject: [PATCH] Fix for crash regarding version checking. --- README.rst | 45 ++++++++++++++------------------------------- replacer.py | 2 +- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/README.rst b/README.rst index fa8d6c5..bf23616 100644 --- a/README.rst +++ b/README.rst @@ -7,13 +7,14 @@ Installation and configuration ------------------------------ In order to use it, you have to have WeeChat with Python plugin support -compiled in. Than, copy ``replacer.py`` to ``~/.weechat/python/``. You can use -any of the Python version - both Python2 and Python3 are supported. You can -optionally create symbolic link to this script: +compiled in. Than, copy ``replacer.py`` to ``~/.local/share/weechat/python/``. +It should run on any version of the Python3. + +You can optionally create symbolic link to this script: .. code:: shell-session - ln -s ~/.weechat/python/replacer.py ~/.weechat/python/autoload/replacer.py + ln -s ~/.local/share/weechat/python/replacer.py ~/.local/share/weechat/python/autoload/replacer.py Next, you need to add this *replacer_plugin* to Weechat completion template, so it'll looks similar to: @@ -30,13 +31,19 @@ Next, load the plugin (if you choose to not load it automatically): Now you all set. +Note, that even though there is possibility for keeping all files in different +place than XDG paths, this case is not tested anymore, and all the issues +regarding old files placement will be ignored. + Usage ----- -Abbreviations will be stored as json file ``~/.weechat/replacement_map.json``, -which role is to simply persist dictionary object on the filesystem. To add -some replacement words, and text which would those words replaced with: +Abbreviations will be stored as json file +``$XDG_DATA_HOME/weechat/replacement_map.json``, which usually be +``~/.local/share/weechat/replacement_map.json`` which role is to simply persist +dictionary object on the filesystem. To add some replacement words, and text +which would those words replaced with: .. code:: @@ -46,30 +53,6 @@ and than, when you type ``foo`` word and press ``tab`` key, you should get ``bar`` word instead. -Upgrade to WeeChat 3.2 ----------------------- - -Starting from WeeChat 3.2 full XDG paths were implemented, so that there -potentially will be a need to move your replacement definition file to move to -the new location. - -For now, you can do nothing, replacer data file will be still looked in old -location, or you can move it to the new location. - -If you decide to the migration, default location for the replacement map -file will be the ``$weechat_data_dir`` which in most of the cases would be -``~/.local/share/weechat``, unless you;re using ``--dir`` or ``--temp-dir`` -weechats params. - -Anyway, if you plan to do the full migration to XDG, and you had your -replacement definition file in ``~/.weechat/replacement_map.json``, and want to -move to the XDG location, than you'll want to move your configuration to -``$XDG_DATA_HOME/weechat``, which usually is ``~/.local/share/weechat`` before -removing old location. Note, that migrating instructions only applies to the -replacer plugin. For WeeChat itself, you'll need to consult WeeChat -documentation. - - License ------- diff --git a/replacer.py b/replacer.py index 3dc9b78..6be16ed 100644 --- a/replacer.py +++ b/replacer.py @@ -79,7 +79,7 @@ class Replacer(object): # nothing found. so there is no replacement file. let's assume the # right file path. - version = weechat.info_get("version_number", "") or 0 + version = int(weechat.info_get("version_number", "")) or 0 if version < 0x3020000: # < 3.2.0 path = '%h/' + map_file return weechat.string_eval_path_home(path, {}, {}, {})