From 58b6c94a8d58fbb36dee3337b1d71239f1931431 Mon Sep 17 00:00:00 2001
From: Bastien Dejean <nihilhill@gmail.com>
Date: Mon, 14 Nov 2016 13:41:19 +0100
Subject: [PATCH] Generalize and consolidate tildify

- Don't do any substitution unless `home_dir_name` exists.

- Don't rely on `gsub` because it might interpret some characters in
  `home_dir` as magical (and might also replace a match not starting at
  the beginning of `path`).
---
 frontend/apps/filemanager/filemanager.lua | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua
index fc81932f7..9228e0165 100644
--- a/frontend/apps/filemanager/filemanager.lua
+++ b/frontend/apps/filemanager/filemanager.lua
@@ -39,13 +39,17 @@ local function getDefaultDir()
     end
 end
 
-local function tildify(path)
-    local home_dir = G_reader_settings:readSetting("home_dir") or getDefaultDir()
-    if home_dir ~= "." then
-        return path:gsub(home_dir, "~", 1)
-    else
-        return path
+local function abbreviate(path)
+    local home_dir_name = G_reader_settings:readSetting("home_dir_name")
+    if home_dir_name ~= nil then
+        local home_dir = G_reader_settings:readSetting("home_dir") or getDefaultDir()
+        local len = home_dir:len()
+        local start = path:sub(1, len)
+        if start == home_dir then
+            return home_dir_name .. path:sub(len+1)
+        end
     end
+    return path
 end
 
 local function restoreScreenMode()
@@ -72,7 +76,7 @@ function FileManager:init()
 
     self.path_text = TextWidget:new{
         face = Font:getFace("infofont", 18),
-        text = tildify(self.root_path),
+        text = abbreviate(self.root_path),
     }
 
     self.banner = FrameContainer:new{
@@ -114,7 +118,7 @@ function FileManager:init()
     self.file_chooser = file_chooser
 
     function file_chooser:onPathChanged(path)  -- luacheck: ignore
-        FileManager.instance.path_text:setText(tildify(path))
+        FileManager.instance.path_text:setText(abbreviate(path))
         UIManager:setDirty(FileManager.instance, function()
             return "ui", FileManager.instance.banner.dimen
         end)