From c7c81a10747e00827ffd9bd335186becdb4dfc18 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Fri, 21 Apr 2023 14:57:02 +0200
Subject: [PATCH] Use find -files0-from in newmail

---
 roles/i3/files/i3blocks/newmail_maildirs      | 20 +++++++++++++++++++
 .../{ => i3blocks}/scripts/arch_linux_news    |  0
 roles/i3/files/{ => i3blocks}/scripts/battery |  0
 .../{ => i3blocks}/scripts/free_disk_space    |  0
 .../i3/files/{ => i3blocks}/scripts/nagstamon |  0
 roles/i3/files/i3blocks/scripts/newmail       | 11 ++++++++++
 roles/i3/files/{ => i3blocks}/scripts/pub-ip  |  0
 roles/i3/files/scripts/newmail                | 15 --------------
 roles/i3/tasks/main.yml                       |  8 +++++++-
 9 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 roles/i3/files/i3blocks/newmail_maildirs
 rename roles/i3/files/{ => i3blocks}/scripts/arch_linux_news (100%)
 rename roles/i3/files/{ => i3blocks}/scripts/battery (100%)
 rename roles/i3/files/{ => i3blocks}/scripts/free_disk_space (100%)
 rename roles/i3/files/{ => i3blocks}/scripts/nagstamon (100%)
 create mode 100755 roles/i3/files/i3blocks/scripts/newmail
 rename roles/i3/files/{ => i3blocks}/scripts/pub-ip (100%)
 delete mode 100755 roles/i3/files/scripts/newmail

diff --git a/roles/i3/files/i3blocks/newmail_maildirs b/roles/i3/files/i3blocks/newmail_maildirs
new file mode 100644
index 0000000..cc74e90
--- /dev/null
+++ b/roles/i3/files/i3blocks/newmail_maildirs
@@ -0,0 +1,20 @@
+$ANSIBLE_VAULT;1.1;AES256
+35393636343537303461653037633231666239313034636430656537656331373930613530396566
+3135623435643836383238633638363338313337326433390a363635353364306337633762333762
+33663035626461333436373635326364646438373130396635663138303838636262396435366539
+3638346238323964300a643138636338346165616231613436343031646366366334663031353433
+33663930613361656166623131656438653865393136666163346365323230313235383934356636
+34346136656335356231326362633831643138353934386236373832653537323939386337383234
+38343637346362363262363265646562643162656630363962393335303962366361653234373265
+62633336643637633039383963333030313831623662663761653266633265613334323036643932
+37613635316530623934396562313533613063363738633663353738306231663765636265663666
+38643764336639393432323264353837376333306333366362643339633638356235393439396636
+36616162653138643437636637623961656663343764343731643932333336646639306563633236
+39333333633639663033313334326333363239616239663830373839363430663365646432356665
+63336330626431363537393362613262343964353863323763393633303437393465373730343137
+64623765306233613265353862663332386231656537313030323466363039366566366562323338
+31323839326530626131393936626439303966636535373032613034393538333834393236666537
+36313736363461343833366531373230343530313861353465666237303331366531366635653365
+61643264353538623336336335646236326635353330623434343432343861653465656436396464
+33303237363461396136613730633963343032346639623538353138363236333034313561313961
+346330646235643062623666633966663737
diff --git a/roles/i3/files/scripts/arch_linux_news b/roles/i3/files/i3blocks/scripts/arch_linux_news
similarity index 100%
rename from roles/i3/files/scripts/arch_linux_news
rename to roles/i3/files/i3blocks/scripts/arch_linux_news
diff --git a/roles/i3/files/scripts/battery b/roles/i3/files/i3blocks/scripts/battery
similarity index 100%
rename from roles/i3/files/scripts/battery
rename to roles/i3/files/i3blocks/scripts/battery
diff --git a/roles/i3/files/scripts/free_disk_space b/roles/i3/files/i3blocks/scripts/free_disk_space
similarity index 100%
rename from roles/i3/files/scripts/free_disk_space
rename to roles/i3/files/i3blocks/scripts/free_disk_space
diff --git a/roles/i3/files/scripts/nagstamon b/roles/i3/files/i3blocks/scripts/nagstamon
similarity index 100%
rename from roles/i3/files/scripts/nagstamon
rename to roles/i3/files/i3blocks/scripts/nagstamon
diff --git a/roles/i3/files/i3blocks/scripts/newmail b/roles/i3/files/i3blocks/scripts/newmail
new file mode 100755
index 0000000..665c143
--- /dev/null
+++ b/roles/i3/files/i3blocks/scripts/newmail
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -z "$LABEL" ]; then
+    LABEL='New: '
+fi
+
+nb_new=$(find -files0-from ~/.config/i3blocks/newmail_maildirs -type d -name new -not -empty -execdir ls '{}' \+ | wc -l)
+
+if [ "$nb_new" -gt 0 ]; then
+    echo "${LABEL}${nb_new}"
+fi
diff --git a/roles/i3/files/scripts/pub-ip b/roles/i3/files/i3blocks/scripts/pub-ip
similarity index 100%
rename from roles/i3/files/scripts/pub-ip
rename to roles/i3/files/i3blocks/scripts/pub-ip
diff --git a/roles/i3/files/scripts/newmail b/roles/i3/files/scripts/newmail
deleted file mode 100755
index 50ade4f..0000000
--- a/roles/i3/files/scripts/newmail
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ -z "$MAILBOX_DIR" ]; then
-    MAILBOX_DIR=~/.local/share/mail/
-fi
-
-if [ -z "$LABEL" ]; then
-    LABEL='New: '
-fi
-
-nb_new=$(find "${MAILBOX_DIR[@]}" -type d -name new -not -empty -execdir ls '{}' \+ | wc -l)
-
-if [ "$nb_new" -gt 0 ]; then
-    echo "${LABEL}${nb_new}"
-fi
diff --git a/roles/i3/tasks/main.yml b/roles/i3/tasks/main.yml
index 4d7c241..15725fa 100644
--- a/roles/i3/tasks/main.yml
+++ b/roles/i3/tasks/main.yml
@@ -147,7 +147,13 @@
     dest: ~/.config/i3blocks/scripts/
     mode: 0755
   with_fileglob:
-    - scripts/*
+    - i3blocks/scripts/*
+
+- name: Copy newmail_maildirs file
+  ansible.builtin.copy:
+    content: "{{ lookup('file', 'i3blocks/newmail_maildirs') | replace('~', ansible_facts.user_dir) | replace('\n', '\0') }}"
+    dest: ~/.config/i3blocks/newmail_maildirs
+    mode: 0644
 
 - name: Update user dirs
   ansible.builtin.command: xdg-user-dirs-update