*/
+/** @file src/util.cc
+ * @brief Utility methods.
+ */
+
#include <stdexcept>
#include <sstream>
+#include <iostream>
#include <iomanip>
+#include <boost/filesystem.hpp>
#include <openssl/sha.h>
#include "KM_util.h"
#include "KM_fileio.h"
#include "util.h"
using namespace std;
+using namespace boost;
-/** Create a UUID.
- * @return UUID.
- */
string
libdcp::make_uuid ()
{
return string (buffer);
}
-/** Create a digest for a file.
- * @param filename File name.
- * @return Digest.
- */
string
-libdcp::make_digest (string filename)
+libdcp::make_digest (string filename, sigc::signal1<void, float>* progress)
{
+ int const file_size = filesystem::file_size (filename);
+
Kumu::FileReader reader;
if (ASDCP_FAILURE (reader.OpenRead (filename.c_str ()))) {
throw runtime_error ("could not open file to compute digest");
SHA1_Init (&sha);
Kumu::ByteString read_buffer (65536);
+ int done = 0;
while (1) {
ui32_t read = 0;
Kumu::Result_t r = reader.Read (read_buffer.Data(), read_buffer.Capacity(), &read);
}
SHA1_Update (&sha, read_buffer.Data(), read);
+ done += read;
+
+ if (progress) {
+ (*progress) (0.5 + (0.5 * done / file_size));
+ }
}
byte_t byte_buffer[20];
stringstream s;
char digest[64];
- s << setfill('0') << setw(36) << Kumu::base64encode (byte_buffer, 20, digest, 64);
- return s.str ();
+ return Kumu::base64encode (byte_buffer, 20, digest, 64);
}