From 6e2a6ea1149fb45ae844c3aeca00a1270ff769bd Mon Sep 17 00:00:00 2001
From: Gregor Krmelj <gregor@krmelj.xyz>
Date: Sat, 9 Jul 2022 10:59:40 +0200
Subject: [PATCH] Fix unprocessed count

Potentially resolves #81.
This second fix implements:
https://github.com/greenstatic/bigbluebutton-exporter/issues/81#issuecomment-1175760097
---
 bbb-exporter/collector.py | 16 ++++++++++++++--
 bbb-exporter/settings.py  |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bbb-exporter/collector.py b/bbb-exporter/collector.py
index 8a7c7cf..8fbc47e 100644
--- a/bbb-exporter/collector.py
+++ b/bbb-exporter/collector.py
@@ -382,9 +382,21 @@ def recordings_deleted_from_disk(bigbluebutton_base_dir) -> int:
 
 def recordings_unprocessed_from_disk(bigbluebutton_base_dir) -> int:
     # bigbluebutton_base_dir i.e. "/var/bigbluebutton/"
-    path = os.path.join(bigbluebutton_base_dir, "recording/status/recorded")
+    sanity = 0
+    processed = 0
+
+    path = os.path.join(bigbluebutton_base_dir, "recording/status/sanity")
     try:
-        return len(os.listdir(path=path))
+        sanity = len(os.listdir(path=path))
+    except FileNotFoundError:
+        logging.info("Path %s doesn't exist, setting unprocessed recordings to 0", path)
+        return 0
+
+    path = os.path.join(bigbluebutton_base_dir, "recording/status/processed")
+    try:
+        processed = len(os.listdir(path=path))
     except FileNotFoundError:
         logging.info("Path %s doesn't exist, setting unprocessed recordings to 0", path)
         return 0
+
+    return sanity - processed
diff --git a/bbb-exporter/settings.py b/bbb-exporter/settings.py
index 110dce6..a09bbdb 100644
--- a/bbb-exporter/settings.py
+++ b/bbb-exporter/settings.py
@@ -5,7 +5,7 @@
 MAJOR = 0
 MINOR = 7
 BUGFIX = 1
-INFO = "preview1"
+INFO = "preview2"
 
 VERSION = "{}.{}.{}".format(MAJOR, MINOR, BUGFIX)
 if INFO: