White space: kdm_cli.{cc,h} usl.{cc,h} zipper.{cc,h}
authorCarl Hetherington <cth@carlh.net>
Sat, 25 Jan 2025 00:02:11 +0000 (01:02 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 25 Jan 2025 00:02:11 +0000 (01:02 +0100)
src/lib/kdm_cli.cc
src/lib/kdm_cli.h
src/lib/usl.cc
src/lib/usl.h
src/lib/zipper.cc
src/lib/zipper.h

index 83d3028aaa7ac84ca096b1a5c3eb380d2db65038..4c5eb46d3acf2b2866f27b69c7bdc35dbbcc0a24 100644 (file)
@@ -60,84 +60,84 @@ using namespace dcpomatic;
 
 
 static void
-help (std::function<void (string)> out)
+help(std::function<void (string)> out)
 {
-       out (String::compose("Syntax: %1 [OPTION] [COMMAND] <FILM|CPL-ID|DKDM>", program_name));
-       out ("Commands:");
-       out ("create          create KDMs; default if no other command is specified");
-       out (variant::insert_dcpomatic("list-cinemas                 list known cinemas from %1 settings"));
-       out (variant::insert_dcpomatic("list-dkdm-cpls               list CPLs for which %1 has DKDMs"));
-       out (variant::insert_dcpomatic("add-dkdm                     add DKDM to %1's list"));
-       out (variant::insert_dcpomatic("dump-decryption-certificate  write the %1 KDM decryption certificate to the console"));
-       out ("  -h, --help                               show this help");
-       out ("  -o, --output <path>                      output file or directory");
-       out ("  -K, --filename-format <format>           filename format for KDMs");
-       out ("  -Z, --container-name-format <format>     filename format for ZIP containers");
-       out ("  -f, --valid-from <time>                  valid from time (e.g. \"2013-09-28T01:41:51+04:00\", \"2018-01-01T12:00:30\") or \"now\"");
-       out ("  -t, --valid-to <time>                    valid to time (e.g. \"2014-09-28T01:41:51\")");
-       out ("  -d, --valid-duration <duration>          valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")");
-       out ("  -F, --formulation <formulation>          modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]");
-       out ("  -p, --disable-forensic-marking-picture   disable forensic marking of pictures essences");
-       out ("  -a, --disable-forensic-marking-audio     disable forensic marking of audio essences (optionally above a given channel, e.g 12)");
-       out ("  -e, --email                              email KDMs to cinemas");
-       out ("  -z, --zip                                ZIP each cinema's KDMs into its own file");
-       out ("  -v, --verbose                            be verbose");
-       out ("  -c, --cinema <name|email>                cinema name (when using -C) or name/email (to filter cinemas)");
-       out ("  -S, --screen <name>                      screen name (when using -C) or screen name (to filter screens when using -c)");
-       out ("  -C, --projector-certificate <file>       file containing projector certificate");
-       out ("  -T, --trusted-device-certificate <file>  file containing a trusted device's certificate");
-       out ("      --decryption-key <file>              file containing the private key which can decrypt the given DKDM");
-       out (variant::insert_dcpomatic("                                           (%1's configured private key will be used otherwise)"));
-       out ("      --cinemas-file <file>                use the given file as a list of cinemas instead of the current configuration");
-       out ("");
-       out (variant::insert_dcpomatic("CPL-ID must be the ID of a CPL that is mentioned in %1's DKDM list."));
-       out ("");
-       out ("For example:");
-       out ("");
-       out ("Create KDMs for my_great_movie to play in all of Fred's Cinema's screens for the next two weeks and zip them up.");
-       out (variant::insert_dcpomatic("(Fred's Cinema must have been set up in %1's KDM window)"));
-       out ("");
-       out (String::compose("\t%1 -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie", program_name));
+       out(String::compose("Syntax: %1 [OPTION] [COMMAND] <FILM|CPL-ID|DKDM>", program_name));
+       out("Commands:");
+       out("create          create KDMs; default if no other command is specified");
+       out(variant::insert_dcpomatic("list-cinemas                 list known cinemas from %1 settings"));
+       out(variant::insert_dcpomatic("list-dkdm-cpls               list CPLs for which %1 has DKDMs"));
+       out(variant::insert_dcpomatic("add-dkdm                     add DKDM to %1's list"));
+       out(variant::insert_dcpomatic("dump-decryption-certificate  write the %1 KDM decryption certificate to the console"));
+       out("  -h, --help                               show this help");
+       out("  -o, --output <path>                      output file or directory");
+       out("  -K, --filename-format <format>           filename format for KDMs");
+       out("  -Z, --container-name-format <format>     filename format for ZIP containers");
+       out("  -f, --valid-from <time>                  valid from time (e.g. \"2013-09-28T01:41:51+04:00\", \"2018-01-01T12:00:30\") or \"now\"");
+       out("  -t, --valid-to <time>                    valid to time (e.g. \"2014-09-28T01:41:51\")");
+       out("  -d, --valid-duration <duration>          valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")");
+       out("  -F, --formulation <formulation>          modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]");
+       out("  -p, --disable-forensic-marking-picture   disable forensic marking of pictures essences");
+       out("  -a, --disable-forensic-marking-audio     disable forensic marking of audio essences (optionally above a given channel, e.g 12)");
+       out("  -e, --email                              email KDMs to cinemas");
+       out("  -z, --zip                                ZIP each cinema's KDMs into its own file");
+       out("  -v, --verbose                            be verbose");
+       out("  -c, --cinema <name|email>                cinema name (when using -C) or name/email (to filter cinemas)");
+       out("  -S, --screen <name>                      screen name (when using -C) or screen name (to filter screens when using -c)");
+       out("  -C, --projector-certificate <file>       file containing projector certificate");
+       out("  -T, --trusted-device-certificate <file>  file containing a trusted device's certificate");
+       out("      --decryption-key <file>              file containing the private key which can decrypt the given DKDM");
+       out(variant::insert_dcpomatic("                                           (%1's configured private key will be used otherwise)"));
+       out("      --cinemas-file <file>                use the given file as a list of cinemas instead of the current configuration");
+       out("");
+       out(variant::insert_dcpomatic("CPL-ID must be the ID of a CPL that is mentioned in %1's DKDM list."));
+       out("");
+       out("For example:");
+       out("");
+       out("Create KDMs for my_great_movie to play in all of Fred's Cinema's screens for the next two weeks and zip them up.");
+       out(variant::insert_dcpomatic("(Fred's Cinema must have been set up in %1's KDM window)"));
+       out("");
+       out(String::compose("\t%1 -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie", program_name));
 }
 
 
 class KDMCLIError : public std::runtime_error
 {
 public:
-       KDMCLIError (std::string message)
-               : std::runtime_error (String::compose("%1: %2", program_name, message).c_str())
+       KDMCLIError(std::string message)
+               : std::runtime_error(String::compose("%1: %2", program_name, message).c_str())
        {}
 };
 
 
 static boost::posix_time::time_duration
-duration_from_string (string d)
+duration_from_string(string d)
 {
        int N;
        char unit_buf[64] = "\0";
-       sscanf (d.c_str(), "%d %63s", &N, unit_buf);
-       string const unit (unit_buf);
+       sscanf(d.c_str(), "%d %63s", &N, unit_buf);
+       string const unit(unit_buf);
 
        if (N == 0) {
-               throw KDMCLIError (String::compose("could not understand duration \"%1\"", d));
+               throw KDMCLIError(String::compose("could not understand duration \"%1\"", d));
        }
 
        if (unit == "year" || unit == "years") {
-               return boost::posix_time::time_duration (N * 24 * 365, 0, 0, 0);
+               return boost::posix_time::time_duration(N * 24 * 365, 0, 0, 0);
        } else if (unit == "week" || unit == "weeks") {
-               return boost::posix_time::time_duration (N * 24 * 7, 0, 0, 0);
+               return boost::posix_time::time_duration(N * 24 * 7, 0, 0, 0);
        } else if (unit == "day" || unit == "days") {
-               return boost::posix_time::time_duration (N * 24, 0, 0, 0);
+               return boost::posix_time::time_duration(N * 24, 0, 0, 0);
        } else if (unit == "hour" || unit == "hours") {
-               return boost::posix_time::time_duration (N, 0, 0, 0);
+               return boost::posix_time::time_duration(N, 0, 0, 0);
        }
 
-       throw KDMCLIError (String::compose("could not understand duration \"%1\"", d));
+       throw KDMCLIError(String::compose("could not understand duration \"%1\"", d));
 }
 
 
 static bool
-always_overwrite ()
+always_overwrite()
 {
        return true;
 }
@@ -145,7 +145,7 @@ always_overwrite ()
 
 static
 void
-write_files (
+write_files(
        list<KDMWithMetadataPtr> kdms,
        bool zip,
        boost::filesystem::path output,
@@ -156,25 +156,25 @@ write_files (
        )
 {
        if (zip) {
-               int const N = write_zip_files (
-                       collect (kdms),
+               int const N = write_zip_files(
+                       collect(kdms),
                        output,
                        container_name_format,
                        filename_format,
-                       bind (&always_overwrite)
+                       bind(&always_overwrite)
                        );
 
                if (verbose) {
-                       out (String::compose("Wrote %1 ZIP files to %2", N, output));
+                       out(String::compose("Wrote %1 ZIP files to %2", N, output));
                }
        } else {
-               int const N = write_files (
+               int const N = write_files(
                        kdms, output, filename_format,
-                       bind (&always_overwrite)
+                       bind(&always_overwrite)
                        );
 
                if (verbose) {
-                       out (String::compose("Wrote %1 KDM files to %2", N, output));
+                       out(String::compose("Wrote %1 KDM files to %2", N, output));
                }
        }
 }
@@ -197,7 +197,7 @@ public:
 
 static
 void
-from_film (
+from_film(
        vector<ScreenDetails> const& screens,
        boost::filesystem::path film_dir,
        bool verbose,
@@ -217,20 +217,20 @@ from_film (
        shared_ptr<Film> film;
        try {
                film = make_shared<Film>(film_dir);
-               film->read_metadata ();
+               film->read_metadata();
                if (verbose) {
-                       out (String::compose("Read film %1", film->name()));
+                       out(String::compose("Read film %1", film->name()));
                }
        } catch (std::exception& e) {
-               throw KDMCLIError (String::compose("error reading film \"%1\" (%2)", film_dir.string(), e.what()));
+               throw KDMCLIError(String::compose("error reading film \"%1\" (%2)", film_dir.string(), e.what()));
        }
 
        /* XXX: allow specification of this */
-       vector<CPLSummary> cpls = film->cpls ();
-       if (cpls.empty ()) {
-               throw KDMCLIError ("no CPLs found in film");
+       vector<CPLSummary> cpls = film->cpls();
+       if (cpls.empty()) {
+               throw KDMCLIError("no CPLs found in film");
        } else if (cpls.size() > 1) {
-               throw KDMCLIError ("more than one CPL found in film");
+               throw KDMCLIError("more than one CPL found in film");
        }
 
        auto cpl = cpls.front().cpl_file;
@@ -240,7 +240,7 @@ from_film (
        try {
                list<KDMWithMetadataPtr> kdms;
                for (auto screen_details: screens) {
-                       std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [film, cpl](dcp::LocalTime begin, dcp::LocalTime end) {
+                       std::function<dcp::DecryptedKDM(dcp::LocalTime, dcp::LocalTime)> make_kdm = [film, cpl](dcp::LocalTime begin, dcp::LocalTime end) {
                                return film->make_kdm(cpl, begin, end);
                        };
                        auto p = kdm_for_screen(
@@ -256,7 +256,7 @@ from_film (
                                period_checks
                                );
                        if (p) {
-                               kdms.push_back (p);
+                               kdms.push_back(p);
                        }
                }
 
@@ -278,30 +278,30 @@ from_film (
                        out("For some of these KDMs the recipient certificate's validity period will not cover the whole of the KDM validity period.  This might cause problems with the KDMs.");
                }
 
-               write_files (kdms, zip, output, container_name_format, filename_format, verbose, out);
+               write_files(kdms, zip, output, container_name_format, filename_format, verbose, out);
                if (email) {
-                       send_emails ({kdms}, container_name_format, filename_format, film->dcp_name(), {});
+                       send_emails({kdms}, container_name_format, filename_format, film->dcp_name(), {});
                }
        } catch (FileError& e) {
-               throw KDMCLIError (String::compose("%1 (%2)", e.what(), e.file().string()));
+               throw KDMCLIError(String::compose("%1 (%2)", e.what(), e.file().string()));
        }
 }
 
 
 static
 optional<dcp::EncryptedKDM>
-sub_find_dkdm (shared_ptr<DKDMGroup> group, string cpl_id)
+sub_find_dkdm(shared_ptr<DKDMGroup> group, string cpl_id)
 {
        for (auto i: group->children()) {
                auto g = dynamic_pointer_cast<DKDMGroup>(i);
                if (g) {
-                       auto dkdm = sub_find_dkdm (g, cpl_id);
+                       auto dkdm = sub_find_dkdm(g, cpl_id);
                        if (dkdm) {
                                return dkdm;
                        }
                } else {
                        auto d = dynamic_pointer_cast<DKDM>(i);
-                       assert (d);
+                       assert(d);
                        if (d->dkdm().cpl_id() == cpl_id) {
                                return d->dkdm();
                        }
@@ -314,15 +314,15 @@ sub_find_dkdm (shared_ptr<DKDMGroup> group, string cpl_id)
 
 static
 optional<dcp::EncryptedKDM>
-find_dkdm (string cpl_id)
+find_dkdm(string cpl_id)
 {
-       return sub_find_dkdm (Config::instance()->dkdms(), cpl_id);
+       return sub_find_dkdm(Config::instance()->dkdms(), cpl_id);
 }
 
 
 static
 dcp::EncryptedKDM
-kdm_from_dkdm (
+kdm_from_dkdm(
        dcp::DecryptedKDM dkdm,
        dcp::Certificate target,
        vector<string> trusted_devices,
@@ -334,13 +334,13 @@ kdm_from_dkdm (
        )
 {
        /* Signer for new KDM */
-       auto signer = Config::instance()->signer_chain ();
-       if (!signer->valid ()) {
-               throw KDMCLIError ("signing certificate chain is invalid.");
+       auto signer = Config::instance()->signer_chain();
+       if (!signer->valid()) {
+               throw KDMCLIError("signing certificate chain is invalid.");
        }
 
        /* Make a new empty KDM and add the keys from the DKDM to it */
-       dcp::DecryptedKDM kdm (
+       dcp::DecryptedKDM kdm(
                valid_from,
                valid_to,
                dkdm.annotation_text().get_value_or(""),
@@ -352,13 +352,13 @@ kdm_from_dkdm (
                kdm.add_key(j);
        }
 
-       return kdm.encrypt (signer, target, trusted_devices, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
+       return kdm.encrypt(signer, target, trusted_devices, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
 }
 
 
 static
 void
-from_dkdm (
+from_dkdm(
        vector<ScreenDetails> const& screens,
        dcp::DecryptedKDM dkdm,
        bool verbose,
@@ -405,33 +405,33 @@ from_dkdm (
 
                        kdms.push_back(make_shared<KDMWithMetadata>(name_values, screen_details.cinema_id, screen_details.cinema.emails, kdm));
                }
-               write_files (kdms, zip, output, container_name_format, filename_format, verbose, out);
+               write_files(kdms, zip, output, container_name_format, filename_format, verbose, out);
                if (email) {
-                       send_emails ({kdms}, container_name_format, filename_format, dkdm.annotation_text().get_value_or(""), {});
+                       send_emails({kdms}, container_name_format, filename_format, dkdm.annotation_text().get_value_or(""), {});
                }
        } catch (FileError& e) {
-               throw KDMCLIError (String::compose("%1 (%2)", e.what(), e.file().string()));
+               throw KDMCLIError(String::compose("%1 (%2)", e.what(), e.file().string()));
        }
 }
 
 
 static
 void
-dump_dkdm_group (shared_ptr<DKDMGroup> group, int indent, std::function<void (string)> out)
+dump_dkdm_group(shared_ptr<DKDMGroup> group, int indent, std::function<void (string)> out)
 {
        auto const indent_string = string(indent, ' ');
 
        if (indent > 0) {
-               out (indent_string + group->name());
+               out(indent_string + group->name());
        }
        for (auto i: group->children()) {
                auto g = dynamic_pointer_cast<DKDMGroup>(i);
                if (g) {
-                       dump_dkdm_group (g, indent + 2, out);
+                       dump_dkdm_group(g, indent + 2, out);
                } else {
                        auto d = dynamic_pointer_cast<DKDM>(i);
                        assert(d);
-                       out (indent_string + d->dkdm().cpl_id());
+                       out(indent_string + d->dkdm().cpl_id());
                }
        }
 }
@@ -466,7 +466,7 @@ dump_decryption_certificate(std::function<void (string)> out)
 
 
 optional<string>
-kdm_cli (int argc, char* argv[], std::function<void (string)> out)
+kdm_cli(int argc, char* argv[], std::function<void (string)> out)
 try
 {
        boost::filesystem::path output = dcp::filesystem::current_path();
@@ -532,16 +532,16 @@ try
 
                switch (c) {
                case 'h':
-                       help (out);
+                       help(out);
                        return {};
                case 'o':
                        output = optarg;
                        break;
                case 'K':
-                       filename_format = dcp::NameFormat (optarg);
+                       filename_format = dcp::NameFormat(optarg);
                        break;
                case 'Z':
-                       container_name_format = dcp::NameFormat (optarg);
+                       container_name_format = dcp::NameFormat(optarg);
                        break;
                case 'f':
                        valid_from = time_from_string(optarg);
@@ -562,7 +562,7 @@ try
                        } else if (string(optarg) == "dci-specific") {
                                formulation = dcp::Formulation::DCI_SPECIFIC;
                        } else {
-                               throw KDMCLIError ("unrecognised KDM formulation " + string (optarg));
+                               throw KDMCLIError("unrecognised KDM formulation " + string(optarg));
                        }
                        break;
                case 'p':
@@ -571,9 +571,9 @@ try
                case 'a':
                        disable_forensic_marking_audio = 0;
                        if (optarg == 0 && argv[optind] != 0 && argv[optind][0] != '-') {
-                               disable_forensic_marking_audio = atoi (argv[optind++]);
+                               disable_forensic_marking_audio = atoi(argv[optind++]);
                        } else if (optarg) {
-                               disable_forensic_marking_audio = atoi (optarg);
+                               disable_forensic_marking_audio = atoi(optarg);
                        }
                        break;
                case 'e':
@@ -652,7 +652,7 @@ try
        }
 
        if (command == "list-dkdm-cpls") {
-               dump_dkdm_group (Config::instance()->dkdms(), 0, out);
+               dump_dkdm_group(Config::instance()->dkdms(), 0, out);
                return {};
        }
 
@@ -673,15 +673,15 @@ try
        }
 
        if (!duration_string && !valid_to) {
-               throw KDMCLIError ("you must specify a --valid-duration or --valid-to");
+               throw KDMCLIError("you must specify a --valid-duration or --valid-to");
        }
 
        if (!valid_from) {
-               throw KDMCLIError ("you must specify --valid-from");
+               throw KDMCLIError("you must specify --valid-from");
        }
 
        if (optind >= argc) {
-               throw KDMCLIError ("no film, CPL ID or DKDM specified");
+               throw KDMCLIError("no film, CPL ID or DKDM specified");
        }
 
        vector<ScreenDetails> screens;
@@ -719,7 +719,7 @@ try
 
        string const thing = argv[optind];
        if (dcp::filesystem::is_directory(thing) && dcp::filesystem::is_regular_file(boost::filesystem::path(thing) / "metadata.xml")) {
-               from_film (
+               from_film(
                        screens,
                        thing,
                        verbose,
@@ -737,18 +737,18 @@ try
                        );
        } else {
                if (dcp::filesystem::is_regular_file(thing)) {
-                       dkdm = dcp::EncryptedKDM (dcp::file_to_string (thing));
+                       dkdm = dcp::EncryptedKDM(dcp::file_to_string(thing));
                } else {
-                       dkdm = find_dkdm (thing);
+                       dkdm = find_dkdm(thing);
                }
 
                if (!dkdm) {
-                       throw KDMCLIError ("could not find film or CPL ID corresponding to " + thing);
+                       throw KDMCLIError("could not find film or CPL ID corresponding to " + thing);
                }
 
                string const key = decryption_key ? dcp::file_to_string(*decryption_key) : Config::instance()->decryption_chain()->key().get();
 
-               from_dkdm (
+               from_dkdm(
                        screens,
                        dcp::DecryptedKDM(*dkdm, key),
                        verbose,
index 4eb2e0fc3fde82b6d08529a545c0eacbd7b3f7ea..6c1a0e7acd4be5f97144eb739496e67672ffd261 100644 (file)
@@ -23,4 +23,4 @@
 #include <string>
 
 
-extern boost::optional<std::string> kdm_cli (int argc, char* argv[], std::function<void (std::string)> out);
+extern boost::optional<std::string> kdm_cli(int argc, char* argv[], std::function<void (std::string)> out);
index 063cc8d6182f25033eb4d92c2b3c9d94c2bff948..989c2675a16de3cd57f0e47dd91b4d8c8d156830 100644 (file)
@@ -24,8 +24,8 @@
 #include "i18n.h"
 
 
-USL::USL ()
-       : CinemaSoundProcessor ("usl", _("USL"), 5.5f, 10, 3.33333333333333333)
+USL::USL()
+       : CinemaSoundProcessor("usl", _("USL"), 5.5f, 10, 3.33333333333333333)
 {
 
 }
index 896fcf971335b3e4b72a41b1fe853c771c4fbff6..cfdb9b7a51c9e6883b763123f7a86e8b240ac0c7 100644 (file)
@@ -30,5 +30,5 @@
 class USL : public CinemaSoundProcessor
 {
 public:
-       USL ();
+       USL();
 };
index 625f3049a52a76df41c13d5bd94a49cfa6f6f3af..7b9d55ef42da3c7eebdcbd234241e9eb526aba07 100644 (file)
@@ -33,28 +33,28 @@ using std::shared_ptr;
 using std::string;
 
 
-Zipper::Zipper (boost::filesystem::path file)
+Zipper::Zipper(boost::filesystem::path file)
 {
        int error;
        _zip = zip_open(dcp::filesystem::fix_long_path(file).string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
        if (!_zip) {
                if (error == ZIP_ER_EXISTS) {
-                       throw FileError ("ZIP file already exists", file);
+                       throw FileError("ZIP file already exists", file);
                }
-               throw FileError ("could not create ZIP file", file);
+               throw FileError("could not create ZIP file", file);
        }
 }
 
 
 void
-Zipper::add (string name, string content)
+Zipper::add(string name, string content)
 {
        shared_ptr<string> copy(new string(content));
-       _store.push_back (copy);
+       _store.push_back(copy);
 
-       auto source = zip_source_buffer (_zip, copy->c_str(), copy->length(), 0);
+       auto source = zip_source_buffer(_zip, copy->c_str(), copy->length(), 0);
        if (!source) {
-               throw runtime_error ("could not create ZIP source");
+               throw runtime_error("could not create ZIP source");
        }
 
 #ifdef DCPOMATIC_HAVE_ZIP_FILE_ADD
@@ -68,16 +68,16 @@ Zipper::add (string name, string content)
 
 
 void
-Zipper::close ()
+Zipper::close()
 {
        if (zip_close(_zip) == -1) {
-               throw runtime_error ("failed to close ZIP archive");
+               throw runtime_error("failed to close ZIP archive");
        }
        _zip = 0;
 }
 
 
-Zipper::~Zipper ()
+Zipper::~Zipper()
 {
        if (_zip) {
                zip_close(_zip);
index 8b634423dc4d5a0552e57aade7b4daf5ebe5b1f8..4cf881aa7932e5e554d65b711ebe75e5fb2e2630 100644 (file)
@@ -28,13 +28,13 @@ class Zipper
 {
 public:
        explicit Zipper(boost::filesystem::path file);
-       ~Zipper ();
+       ~Zipper();
 
-       Zipper (Zipper const&) = delete;
-       Zipper& operator= (Zipper const&) = delete;
+       Zipper(Zipper const&) = delete;
+       Zipper& operator=(Zipper const&) = delete;
 
-       void add (std::string name, std::string content);
-       void close ();
+       void add(std::string name, std::string content);
+       void close();
 
 private:
        struct zip* _zip;