Merge ba207a0 into 786b0cc

opencor · Feb 22, 2019 · 21bc5d2 · 21bc5d2
2 parents 786b0cc + ba207a0
commit 21bc5d2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/plugins/miscellaneous/Core/src/corecliutils.cpp b/src/plugins/miscellaneous/Core/src/corecliutils.cpp
@@ -321,6 +321,24 @@ QString sha1(const QString &pString)
 
 //==============================================================================
 
+QString fileSha1(const QString &pFileName)
+{
+    // Return the SHA-1 value of the given file
+
+    QFile file(pFileName);
+
+    if (file.open(QFile::ReadOnly)) {
+        QCryptographicHash hash(QCryptographicHash::Sha1);
+
+        if (hash.addData(&file))
+            return hash.result();
+    }
+
+    return QString();
+}
+
+//==============================================================================
+
 void stringPositionAsLineColumn(const QString &pString, const QString &pEol,
                                 int pPosition, int &pLine, int &pColumn)
 {

diff --git a/src/plugins/miscellaneous/Core/src/corecliutils.h b/src/plugins/miscellaneous/Core/src/corecliutils.h
@@ -128,6 +128,7 @@ QString CORE_EXPORT formatTime(qint64 pTime);
 
 QString CORE_EXPORT sha1(const QByteArray &pByteArray);
 QString CORE_EXPORT sha1(const QString &pString);
+QString CORE_EXPORT fileSha1(const QString &pFileName);
 
 void CORE_EXPORT stringPositionAsLineColumn(const QString &pString,
                                             const QString &pEol, int pPosition,

diff --git a/src/plugins/miscellaneous/Core/src/file.cpp b/src/plugins/miscellaneous/Core/src/file.cpp
@@ -144,15 +144,9 @@ File::Status File::check()
 
 QString File::sha1(const QString &pFileName)
 {
-    // Compute the SHA-1 value for the given file, if it still exists and can be
-    // opened
+    // Return the SHA-1 value of the given file
 
-    QByteArray fileContents;
-
-    if (readFile(pFileName, fileContents))
-        return Core::sha1(fileContents);
-    else
-        return QString();
+    return Core::fileSha1(pFileName);
 }
 
 //==============================================================================