From 48ea3b89c9d81f87b2935371086656522440bda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 17 Dec 2020 03:10:59 +0100
Subject: [PATCH] file_storage: Cleanup the user storage path when removing
 prints

Try to remove user and devices directories if they are empty.
---
 src/file_storage.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/file_storage.c b/src/file_storage.c
index 47fb222..db9a971 100644
--- a/src/file_storage.c
+++ b/src/file_storage.c
@@ -230,6 +230,7 @@ file_storage_print_data_load (FpDevice   *dev,
 int
 file_storage_print_data_delete (FpDevice *dev, FpFinger finger, const char *username)
 {
+  g_autoptr(GSList) prints = NULL;
   g_autofree gchar *base_store = NULL;
   g_autofree gchar *path = NULL;
   int r;
@@ -245,7 +246,19 @@ file_storage_print_data_delete (FpDevice *dev, FpFinger finger, const char *user
   g_debug ("file_storage_print_data_delete(): unlink(\"%s\") %s",
            path, g_strerror (r));
 
-  /* FIXME: cleanup empty directory */
+  prints = file_storage_discover_prints (dev, username);
+  if (!prints)
+    {
+      g_autofree char *dir = g_steal_pointer (&path);
+
+      do
+        {
+          g_autofree char *tmp = g_steal_pointer (&dir);
+          dir = g_path_get_dirname (tmp);
+        }
+      while (g_str_has_prefix (dir, base_store) && g_rmdir (dir) == 0);
+    }
+
   return r;
 }