From b6d1344a807f11d8eb3d0c9fd599ced050bb14cf Mon Sep 17 00:00:00 2001
From: Peter Wilton <peterw@23andme.com>
Date: Mon, 29 Jul 2024 09:23:35 -0500
Subject: [PATCH 1/2] fix readme typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4621a86..1f2a514 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ Optional fields are:
 - rsync will receive the flags `-varze` for remote syncing and `-var` for local syncing by default. Any flags you set using `rsync_flags` will override these flags.
     
 ## Usage
-If ```auto_sync_up``` is set to 1, the plugin will automatically launch the ```:ARsyncUP``` command
+If ```auto_sync_up``` is set to 1, the plugin will automatically launch the ```:ARsyncUp``` command
 everytime a buffer is saved.
 
 Setting ```rsync_flags``` to include `-ul`, for example, will use rsync's 'update' feature and will also copy over symlinks. Check out rsync's man page to see all the options it supports.

From 8f07277b3786abebf41e82732edbec812d3f880f Mon Sep 17 00:00:00 2001
From: Peter Wilton <peterw@23andme.com>
Date: Tue, 6 Aug 2024 10:10:08 -0500
Subject: [PATCH 2/2] Add toggle functionality

---
 plugin/vim-arsync.vim | 67 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/plugin/vim-arsync.vim b/plugin/vim-arsync.vim
index fdd9d9c..14a99d4 100644
--- a/plugin/vim-arsync.vim
+++ b/plugin/vim-arsync.vim
@@ -37,36 +37,59 @@ function! LoadConf()
         let l:conf_dict['local_options'] = "-var"
     endif
     if !has_key(l:conf_dict, "remote_options")
-        let l:conf_dict['remote_options'] = "-vazre"
+        let l:conf_dict['remote_options'] = "-vazr"
     endif
     return l:conf_dict
 endfunction
 
 function! JobHandler(job_id, data, event_type)
-    " redraw | echom a:job_id . ' ' . a:event_type
-    if a:event_type == 'stdout' || a:event_type == 'stderr'
-        " redraw | echom string(a:data)
-        if has_key(getqflist({'id' : g:qfid}), 'id')
-            call setqflist([], 'a', {'id' : g:qfid, 'lines' : a:data})
-        endif
-    elseif a:event_type == 'exit'
+    if a:event_type == 'exit'
         if a:data != 0
             copen
-        endif
-        if a:data == 0
+        elseif a:data == 0
+            let s:filename = expand('%:t')
+            echohl Green
             echo "vim-arsync success."
+            echohl None
+            " Clear message after 2 seconds and show filename
+            call timer_start(2000, 'ShowFilename')
         endif
-        " echom string(a:data)
     endif
 endfunction
 
+function! ShowFilename(timer_id)
+    echo s:filename . " (project synced.)"
+endfunction
+
+" function! JobHandler(job_id, data, event_type)
+"     " redraw | echom a:job_id . ' ' . a:event_type
+"     let prev_msg = execute('messages')[-1]
+"     if a:event_type == 'stdout' || a:event_type == 'stderr'
+"         " redraw | echom string(a:data)
+"         if has_key(getqflist({'id' : g:qfid}), 'id')
+"             call setqflist([], 'a', {'id' : g:qfid, 'lines' : a:data})
+"         endif
+"     elseif a:event_type == 'exit'
+"         if a:data != 0
+"             copen
+"         endif
+"         if a:data == 0
+"             echo "vim-arsync success."
+"             call timer_start(2000, {-> execute('echo "'. prev_msg . '"')})
+"         endif
+"         " echom string(a:data)
+"     endif
+" endfunction
+
 function! ShowConf()
     let l:conf_dict = LoadConf()
-    echo l:conf_dict
     echom string(getqflist())
 endfunction
 
 function! ARsync(direction)
+    if filereadable('.vim-arsync-disabled')
+        return
+    endif
     let l:conf_dict = LoadConf()
     if has_key(l:conf_dict, 'remote_host')
         let l:user_passwd = ''
@@ -84,7 +107,7 @@ function! ARsync(direction)
             if a:direction == 'down'
                 let l:cmd = [ 'rsync', l:conf_dict['remote_options'], 'ssh -p '.l:conf_dict['remote_port'], l:user_passwd . l:conf_dict['remote_host'] . ':' . l:conf_dict['remote_path'] . '/', l:conf_dict['local_path'] . '/']
             elseif  a:direction == 'up'
-                let l:cmd = [ 'rsync', l:conf_dict['remote_options'], 'ssh -p '.l:conf_dict['remote_port'], l:conf_dict['local_path'] . '/', l:user_passwd . l:conf_dict['remote_host'] . ':' . l:conf_dict['remote_path'] . '/']
+                let l:cmd = [ 'rsync', l:conf_dict['remote_options'], "--filter", ':- .gitignore', l:conf_dict['local_path'] . '/', l:user_passwd . l:conf_dict['remote_host'] . ':' . l:conf_dict['remote_path'] . '/']
             else " updelete
                 let l:cmd = [ 'rsync', l:conf_dict['remote_options'], 'ssh -p '.l:conf_dict['remote_port'], l:conf_dict['local_path'] . '/', l:user_passwd . l:conf_dict['remote_host'] . ':' . l:conf_dict['remote_path'] . '/', '--delete']
             endif
@@ -127,6 +150,9 @@ function! ARsync(direction)
 endfunction
 
 function! AutoSync()
+    if filereadable('.vim-arsync-disabled')
+        return
+    endif
     let l:conf_dict = LoadConf()
     if has_key(l:conf_dict, 'auto_sync_up')
         if l:conf_dict['auto_sync_up'] == 1
@@ -146,10 +172,25 @@ if !executable('rsync')
     finish
 endif
 
+function! ARsyncToggle()
+    let l:filename = getcwd() . '/.vim-arsync-disabled'
+
+    if filereadable(l:filename)
+        call delete(l:filename)
+        echo "Enabled vim-arysnc auto sync up"
+    else
+        " File not found, create it
+        call writefile([], l:filename)
+        echo "Disabled vim-arysnc auto sync up"
+    endif
+endfunction
+
+
 command! ARsyncUp call ARsync('up')
 command! ARsyncUpDelete call ARsync('upDelete')
 command! ARsyncDown call ARsync('down')
 command! ARshowConf call ShowConf()
+command! ARsyncToggle call ARsyncToggle()
 
 augroup vimarsync
     autocmd!