From 97ea10e463fdb60a94b88840f9902d8ea8b6037f Mon Sep 17 00:00:00 2001
From: am0ebe <am0ebe@gmx.de>
Date: Fri, 5 Jul 2024 15:08:36 +0200
Subject: [PATCH] mv calcdirsize from util to record
---
src/record.cpp | 18 +++++++++++++++++-
src/record.h | 1 +
src/utils.cpp | 16 ----------------
src/utils.h | 1 -
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/record.cpp b/src/record.cpp
index fe367bb..15daefa 100644
--- a/src/record.cpp
+++ b/src/record.cpp
@@ -206,7 +206,7 @@ void Record::checkDiskSpace(const QString &dir, seconds dur)
//in bytes
qint64 available = storageInfo.bytesAvailable();
qint64 total = storageInfo.bytesTotal();
- qint64 used = utils::calcDirSize(dir);
+ qint64 used = calcDirSize(dir);
int usedPercentage = (double(used) / total) * 100;
info( progressBar(usedPercentage) ); // << cuz of this line, the function is here not in utils...
@@ -224,3 +224,19 @@ void Record::checkDiskSpace(const QString &dir, seconds dur)
qWarning() << "Warning: Estimated recording space exceeds available space!";
}
}
+
+qint64 Record::calcDirSize(const QString &dirrr) {
+ QDir dir(dirrr);
+ qint64 size = 0;
+
+ // Recursively calculate size of files in the directory
+ foreach(QFileInfo fileInfo, dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot, QDir::DirsFirst))
+ {
+ if (fileInfo.isDir())
+ size += calcDirSize(fileInfo.absoluteFilePath());
+ else
+ size += fileInfo.size();
+ }
+
+ return size;
+}
diff --git a/src/record.h b/src/record.h
index 65e56f4..b0d7a59 100644
--- a/src/record.h
+++ b/src/record.h
@@ -35,6 +35,7 @@ public slots:
private:
bool checkDirExists();
+ qint64 calcDirSize(const QString &);
CamPtr _cam;
QTimer* _timer;
diff --git a/src/utils.cpp b/src/utils.cpp
index 16e13c8..84f10db 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -251,20 +251,4 @@ QString settingsFile(QString filename)
return _settingsFile.isEmpty() ? utils::getFirstFileInAppDirEndingWith("xml") : _settingsFile;
}
-qint64 calcDirSize(const QString &dirrr) {
- QDir dir(dirrr);
- qint64 size = 0;
-
- // Recursively calculate size of files in the directory
- foreach(QFileInfo fileInfo, dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot, QDir::DirsFirst))
- {
- if (fileInfo.isDir())
- size += calcDirSize(fileInfo.absoluteFilePath());
- else
- size += fileInfo.size();
- }
-
- return size;
-}
-
} // namespace utils
diff --git a/src/utils.h b/src/utils.h
index bf59a66..adad047 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -24,7 +24,6 @@ QString outDir(QString dirname="");
int frameSize();
int fps();
-qint64 calcDirSize(const QString &);
QString getFirstFileInAppDirEndingWith( QString const&);
--
GitLab