Write subtitle stuff to a subdirectory based on ID.

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index d2116362edd157359acf079b5fe17f595028ef62..31c265e2f73e82a60a590d251e99b89c729027a6 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -512,18 +512,24 @@ Writer::finish ()
                        boost::filesystem::path const from = i->file.get_value_or (liberation);
                        _subtitle_content->add_font (i->id, from.leaf().string ());
 
-                       boost::filesystem::path to = _film->dir (_film->dcp_name ()) / from.leaf();
+                       boost::filesystem::path to = _film->dir (_film->dcp_name ()) / _subtitle_content->id ();
+                       boost::filesystem::create_directories (to, ec);
+                       if (ec) {
+                               throw FileError (_("Could not create directory"), to);
+                       }
+
+                       to /= from.leaf();
 
                        boost::system::error_code ec;
                        boost::filesystem::copy_file (from, to, ec);
-                       if (!ec) {
-                               dcp.add (shared_ptr<dcp::Font> (new dcp::Font (to)));
-                       } else {
-                               LOG_WARNING_NC (String::compose ("Could not copy font %1 to DCP", from.string ()));
+                       if (ec) {
+                               throw FileError ("Could not copy font to DCP", from);
                        }
+
+                       dcp.add (shared_ptr<dcp::Font> (new dcp::Font (to)));
                }
 
-               _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ());
+               _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _subtitle_content->id () / _film->subtitle_xml_filename ());
                reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
                                   new dcp::ReelSubtitleAsset (
                                           _subtitle_content,