Merge installer branch.

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index d99c3801f665b8a77215adb8f3804753c04acf4b..edb202df260ea0f6dd333a8a455e627deeb07d22 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -39,6 +39,9 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
+#ifdef DCPOMATIC_WINDOWS
+#include <boost/locale.hpp>
+#endif
 #include <glib.h>
 #include <openjpeg.h>
 #include <openssl/md5.h>
@@ -89,6 +92,7 @@ using std::istream;
 using std::numeric_limits;
 using std::pair;
 using std::cout;
+using std::streampos;
 using boost::shared_ptr;
 using boost::thread;
 using boost::lexical_cast;
@@ -281,6 +285,14 @@ dcpomatic_setup ()
        /* Dark voodoo which, I think, gets boost::filesystem::path to
           correctly convert UTF-8 strings to paths, and also paths
           back to UTF-8 strings (on path::string()).
+
+          After this, constructing boost::filesystem::paths from strings
+          converts from UTF-8 to UTF-16 inside the path.  Then
+          path::string().c_str() gives UTF-8 and
+          path::c_str()          gives UTF-16.
+
+          This is all Windows-only.  AFAICT Linux/OS X use UTF-8 everywhere,
+          so things are much simpler.
        */
        std::locale::global (boost::locale::generator().generate (""));
        boost::filesystem::path::imbue (std::locale ());
@@ -338,6 +350,8 @@ dcpomatic_setup_gettext_i18n (string lang)
                putenv (cmd);
                snprintf (cmd, sizeof(cmd), "LANG=%s", lang.c_str ());
                putenv (cmd);
+               snprintf (cmd, sizeof(cmd), "LC_ALL=%s", lang.c_str ());
+               putenv (cmd);
        }
 
        setlocale (LC_ALL, "");
@@ -394,46 +408,9 @@ md5_digest (void const * data, int size)
        return s.str ();
 }
 
-/** @param file File name.
- *  @return MD5 digest of file's contents.
- */
-string
-md5_digest (boost::filesystem::path file)
-{
-       FILE* f = fopen_boost (file, "rb");
-       if (!f) {
-               throw OpenFileError (file.string());
-       }
-
-       boost::uintmax_t bytes = boost::filesystem::file_size (file);
-
-       boost::uintmax_t const buffer_size = 64 * 1024;
-       char buffer[buffer_size];
-
-       MD5_CTX md5_context;
-       MD5_Init (&md5_context);
-       while (bytes > 0) {
-               int const t = min (bytes, buffer_size);
-               fread (buffer, 1, t, f);
-               MD5_Update (&md5_context, buffer, t);
-               bytes -= t;
-       }
-
-       unsigned char digest[MD5_DIGEST_LENGTH];
-       MD5_Final (digest, &md5_context);
-       fclose (f);
-
-       stringstream s;
-       for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) {
-               s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]);
-       }
-
-       return s.str ();
-}
-
 /** @param job Optional job for which to report progress */
 string
-md5_digest_directory (boost::filesystem::path directory, shared_ptr<Job> job)
+md5_digest (vector<boost::filesystem::path> files, shared_ptr<Job> job)
 {
        boost::uintmax_t const buffer_size = 64 * 1024;
        char buffer[buffer_size];
@@ -441,32 +418,29 @@ md5_digest_directory (boost::filesystem::path directory, shared_ptr<Job> job)
        MD5_CTX md5_context;
        MD5_Init (&md5_context);
 
-       int files = 0;
-       if (job) {
-               for (boost::filesystem::directory_iterator i(directory); i != boost::filesystem::directory_iterator(); ++i) {
-                       ++files;
-               }
+       vector<int64_t> sizes;
+       for (size_t i = 0; i < files.size(); ++i) {
+               sizes.push_back (boost::filesystem::file_size (files[i]));
        }
 
-       int j = 0;
-       for (boost::filesystem::directory_iterator i(directory); i != boost::filesystem::directory_iterator(); ++i) {
-               FILE* f = fopen_boost (i->path(), "rb");
+       for (size_t i = 0; i < files.size(); ++i) {
+               FILE* f = fopen_boost (files[i], "rb");
                if (!f) {
-                       throw OpenFileError (i->path().string());
+                       throw OpenFileError (files[i].string());
                }
 
-               boost::uintmax_t bytes = boost::filesystem::file_size (i->path ());
+               boost::uintmax_t const bytes = boost::filesystem::file_size (files[i]);
+               boost::uintmax_t remaining = bytes;
 
-               while (bytes > 0) {
-                       int const t = min (bytes, buffer_size);
+               while (remaining > 0) {
+                       int const t = min (remaining, buffer_size);
                        fread (buffer, 1, t, f);
                        MD5_Update (&md5_context, buffer, t);
-                       bytes -= t;
-               }
+                       remaining -= t;
 
-               if (job) {
-                       job->set_progress (float (j) / files);
-                       ++j;
+                       if (job) {
+                               job->set_progress ((float (i) + 1 - float(remaining) / bytes) / files.size ());
+                       }
                }
 
                fclose (f);
@@ -567,7 +541,7 @@ Socket::connect (boost::asio::ip::tcp::endpoint endpoint)
        } while (ec == boost::asio::error::would_block);
 
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_connect (%1)"), ec.value ()));
        }
 
        if (!_socket.is_open ()) {
@@ -591,7 +565,7 @@ Socket::accept (int port)
        _acceptor = 0;
        
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_accept (%1)"), ec.value ()));
        }
 }
 
@@ -612,7 +586,7 @@ Socket::write (uint8_t const * data, int size)
        } while (ec == boost::asio::error::would_block);
 
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_write (%1)"), ec.value ()));
        }
 }
 
@@ -640,7 +614,7 @@ Socket::read (uint8_t* data, int size)
        } while (ec == boost::asio::error::would_block);
        
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_read (%1)"), ec.value ()));
        }
 }