Catch more errors when non-CPLs are loaded as CPLs.

[dcpomatic.git] / src / wx / kdm_cpl_panel.cc

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index db05db27c9697962059fe4186714ca2a3025a48c..aaf88f7134cbad872207c666e692fa8bba5236f8 100644 (file)
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,7 +22,9 @@
 #include "wx_util.h"
 #include "static_text.h"
 #include "dcpomatic_button.h"
+#include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
+#include <boost/foreach.hpp>
 
 using std::vector;
 
@@ -67,8 +69,8 @@ KDMCPLPanel::update_cpl_choice ()
 {
        _cpl->Clear ();
 
-       for (vector<CPLSummary>::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-               _cpl->Append (std_to_wx (i->cpl_id));
+       BOOST_FOREACH (CPLSummary const & i, _cpls) {
+               _cpl->Append (std_to_wx(i.cpl_id));
 
                if (_cpls.size() > 0) {
                        _cpl->SetSelection (0);
@@ -105,21 +107,48 @@ KDMCPLPanel::cpl_browse_clicked ()
 
        d->Destroy ();
 
-       /* XXX: hack alert */
-       cxml::Document cpl_document ("CompositionPlaylist");
-       cpl_document.read_file (cpl_file);
-
        try {
+               /* XXX: hack alert */
+               cxml::Document cpl_document ("CompositionPlaylist");
+               cpl_document.read_file (cpl_file);
+
+               bool encrypted = false;
+               BOOST_FOREACH (cxml::ConstNodePtr i, cpl_document.node_children("ReelList")) {
+                       BOOST_FOREACH (cxml::ConstNodePtr j, i->node_children("Reel")) {
+                               BOOST_FOREACH (cxml::ConstNodePtr k, j->node_children("AssetList")) {
+                                       BOOST_FOREACH (cxml::ConstNodePtr l, k->node_children()) {
+                                               if (!l->node_children("KeyId").empty()) {
+                                                       encrypted = true;
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               if (!encrypted) {
+                       error_dialog (this, _("This CPL contains no encrypted assets."));
+                       return;
+               }
+
+               /* We're ignoring the CPLSummary timestamp stuff here and just putting the new one in at the end
+                  of the list, then selecting it.
+               */
+
                _cpls.push_back (
                        CPLSummary (
                                dcp_dir.filename().string(),
                                cpl_document.string_child("Id").substr (9),
-                               cpl_document.string_child ("ContentTitleText"),
-                               cpl_file
+                               cpl_document.string_child("ContentTitleText"),
+                               cpl_file,
+                               encrypted,
+                               0
                                )
                        );
-       } catch (cxml::Error) {
-               error_dialog (this, _("This is not a valid CPL file"));
+       } catch (xmlpp::exception& e) {
+               error_dialog (this, _("This is not a valid CPL file"), std_to_wx(e.what()));
+               return;
+       } catch (cxml::Error& e) {
+               error_dialog (this, _("This is not a valid CPL file"), std_to_wx(e.what()));
                return;
        }