Improve compliance/sanity of XDG implementation

1 files changed, 27 insertions, 18 deletions

diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim
index 675cf460..62d515c1 100644
--- a/vim/autoload/xdg.vim
+++ b/vim/autoload/xdg.vim
@@ -7,6 +7,8 @@ let s:defaults = {
       \ 'XDG_DATA_DIRS': '/usr/local/share/:/usr/share/',
       \}
 
+let s:subdir = 'vim'
+
 function! s:Get(name) abort
   let name = a:name
   let env = environ()
@@ -23,31 +25,38 @@ function! s:Absolute(path) abort
   return a:path =~# '^[/~]'
 endfunction
 
-function! xdg#CacheDir(name) abort
-  let name = a:name
-  let home = s:Get('XDG_CACHE_HOME')
+function! s:Home(name) abort
+  let home = s:Get(a:name)
   if !s:Absolute(home)
     return ''
   endif
-  return join([home, name], '/')
+  return join([home, s:subdir], '/')
 endfunction
 
-function! xdg#ConfigDirs(name) abort
-  let name = a:name
-  let home = s:Get('XDG_CONFIG_HOME')
-  let dirs = split(s:Get('XDG_CONFIG_DIRS'), ':')
-  return map(
-        \ filter(insert(dirs, home), 's:Absolute(v:val)')
-        \,'join([v:val, name], "/")'
-        \)
+function! xdg#CacheHome() abort
+  return s:Home('XDG_CACHE_HOME')
 endfunction
 
-function! xdg#DataDirs(name) abort
-  let name = a:name
-  let home = s:Get('XDG_DATA_HOME')
-  let dirs = split(s:Get('XDG_DATA_DIRS'), ':')
+function! xdg#ConfigHome() abort
+  return s:Home('XDG_CONFIG_HOME')
+endfunction
+
+function! xdg#DataHome() abort
+  return s:Home('XDG_DATA_HOME')
+endfunction
+
+function! s:Dirs(name) abort
+  let dirs = split(s:Get(a:name), ':')
   return map(
-        \ filter(insert(dirs, home), 's:Absolute(v:val)')
-        \,'join([v:val, name], "/")'
+        \ filter(dirs, 's:Absolute(v:val)')
+        \,'join([v:val, s:subdir], "/")'
         \)
 endfunction
+
+function! xdg#ConfigDirs() abort
+  return s:Dirs('XDG_CONFIG_DIRS')
+endfunction
+
+function! xdg#DataDirs() abort
+  return s:Dirs('XDG_DATA_DIRS')
+endfunction