Merge pull request #16 from xu3s/new_branch

fixing termux backend for charging status and termux backend checker
lambdalisue · Apr 5, 2021 · 9e93f4a · 9e93f4a
2 parents f7a6ab0 + 4a1da7e
commit 9e93f4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/autoload/battery.vim b/autoload/battery.vim
@@ -93,10 +93,10 @@ function! s:get_available_backend() abort
     return 'powershell'
   elseif battery#backend#linux#is_available()
     return 'linux'
-  elseif battery#backend#freebsd#is_available()
-    return 'freebsd'
   elseif battery#backend#termux#is_available()
     return 'termux'
+  elseif battery#backend#freebsd#is_available()
+    return 'freebsd'
   endif
   return 'dummy'
 endfunction

diff --git a/autoload/battery/backend/termux.vim b/autoload/battery/backend/termux.vim
@@ -18,9 +18,10 @@ function! s:on_stdout(buffer, data) abort
 endfunction
 
 function! s:on_exit(backend, buffer, exitval) abort
-  let content = join(a:buffer, '')
-  let a:backend.is_charging = json_decode(content).status !=# 'NOT_CHARGING'
-  let a:backend.value = json_decode(content).percentage + 0
+  let obj = json_decode(join(a:buffer, ''))
+  let status = get(obj, 'status', '')
+  let a:backend.is_charging = !(status ==# 'NOT_CHARGING' || status ==# 'DISCHARGING')
+  let a:backend.value = get(obj, 'percentage', 0) + 0
 endfunction
 
 function! battery#backend#termux#define() abort