attempt to improve ifuse-photos-to-tmp unmounting

1 files changed, 22 insertions, 4 deletions

diff --git a/bin/ifuse-photos-to-tmp b/bin/ifuse-photos-to-tmp
index 45b46d24..7d631002 100755
--- a/bin/ifuse-photos-to-tmp
+++ b/bin/ifuse-photos-to-tmp
@@ -128,8 +128,8 @@ remove_tree(glob("$mount/PhotoData/Thumbnails/V2/DCIM/10*"),
             "$mount/PhotoData/MISC");
 # (source: https://ubuntuforums.org/archive/index.php/t-2203298.html)
 
-system "fusermount -u $mount";
-warn "failed to unmount $mount" unless ($? == 0);
+say "attempting unmount of photos";
+patient_unmount($mount);
 
 system "ifuse --documents org.videolan.vlc-ios $mount";
 die "could not mount $mount with ifuse" unless ($? == 0);
@@ -150,11 +150,29 @@ foreach my $file (glob qq<"${mount}/Apple CoreAudio format*.caf">) {
     move $file, $target;
 }
 
-system "fusermount -u $mount";
-warn "failed to unmount $mount" unless ($? == 0);
+say "attempting unmount of voice notes";
+patient_unmount($mount);
 
 if (fork) {
     exit;
 } else {
     exec "xdg-open", $dest;
 }
+
+sub patient_unmount {
+    my $mount = shift;
+    my $count = 0;
+    while ($count < 3) {
+	system "fusermount -u $mount";
+	if ($? == 0) {
+	    say " unmounted.";
+	    last;
+	} else {
+	    print "\n" if $count > 0;
+	    print "unmount failed; waiting a few seconds ..";
+	    sleep 2;
+	    $count++;
+	}
+    }
+    die "failed to unmount $mount" unless $? == 0;
+}