FIx suffix-only-duplicates.

Author: dillof

docs/ckmamerc.mdoc

@@ -26,7 +26,7 @@
 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd May 7, 2026
+.Dd May 15, 2026
 .Dt CKMAMERC 5
 .Os
 .Sh NAME
@@ -162,6 +162,10 @@ Boolean.
 .El
 .It roms-zipped
 Boolean.
+.It suffix-only-duplicates
+Boolean. If true, the 
+.It game_name_suffix
+will only be used for games that would otherwise have duplicate names.
 .It use-central-cache-directory
 Boolean.
 Put the cache databases generated by

src/Configuration.cc

@@ -130,6 +130,7 @@ TomlSchema::TypePtr Configuration::section_schema = TomlSchema::table(
       TomlSchema::alternatives({TomlSchema::integer(), TomlSchema::constant("all")}, "integer or 'all'")},
      {"status-db-keep-runs",
       TomlSchema::alternatives({TomlSchema::integer(), TomlSchema::constant("all")}, "integer or 'all'")},
+     {"suffix-only-duplicates", TomlSchema::boolean()},
      {"unknown-directory", TomlSchema::string()},
      {"update-database", TomlSchema::boolean()},
      {"use-central-cache-directory", TomlSchema::boolean()},
@@ -304,6 +305,7 @@ void Configuration::reset() {
     }
     status_db = StatusDB::default_name();
     status_db_keep_runs = 2;
+    suffix_only_duplicates = false;
     unknown_directory = "unknown";
     update_database = false;
     use_central_cache_directory = false;
@@ -654,6 +656,7 @@ void Configuration::merge_config_table(const toml::table* table_pointer) {
     set_bool(table, "roms-zipped", roms_zipped);
     set_string(table, "saved-directory", saved_directory);
     set_string(table, "status-db", status_db);
+    set_bool(table, "suffix-only-duplicates", suffix_only_duplicates);
     set_integer_or_all(table, "status-db-keep-days", status_db_keep_days);
     set_integer_or_all(table, "status-db-keep-runs", status_db_keep_runs);
     set_string(table, "unknown-directory", unknown_directory);
@@ -823,7 +826,7 @@ bool Configuration::dat_create_fixdat(const std::string& dat) {
 bool Configuration::dat_suffix_only_duplicates(const std::string& dat) {
     auto it = dat_options.find(dat);
     if (it == dat_options.end() || !it->second.suffix_only_duplicates.has_value()) {
-        return false;
+        return suffix_only_duplicates;
     }
     return *it->second.suffix_only_duplicates;
 }

src/Configuration.h

@@ -134,6 +134,7 @@ class Configuration {
     bool use_torrentzip;              // use TORRENTZIP format for zip archives in ROM set.
     bool verbose;                     // print all actions taken to fix ROM set
     bool allow_empty_dat;             // Update RomDB even if dat is empty.
+    bool suffix_only_duplicates;      // use game_name_suffix only for names that would otherwise be duplicates.
 
     // TODO: Are these needed? They have no command line options.
     /* file_correct */

src/OutputContext.cc

@@ -221,7 +221,7 @@ bool OutputContext::finish() {
                 auto original_name = game->name;
                 auto new_name = game->name;
                 if (!suffix.empty()) {
-                    new_name += " " + suffix;
+                    new_name += suffix;
                 }
                 if (counts[new_name] > 0) {
                     new_name += " (" + std::to_string(counts[new_name]) + ")";
@@ -330,6 +330,7 @@ const std::string& OutputContext::final_game_name(size_t dat_no, const std::stri
 DatOptions::DatOptions(std::optional<std::string> dat_name) {
     if (dat_name) {
         game_name_suffix = configuration.dat_game_name_suffix(*dat_name);
+        suffix_only_duplicates = configuration.dat_suffix_only_duplicates(*dat_name);
         use_description_as_name = configuration.dat_use_description_as_name(*dat_name);
     }
     else {

src/OutputContext.h

@@ -79,6 +79,7 @@ class DatOptions {
      * @return The suffix to add to the game name.
      */
 
+    std::string name_suffix() const { return suffix_only_duplicates ? "" : game_name_suffix; }
     std::string duplicate_name_suffix() const {return suffix_only_duplicates ? game_name_suffix : "";}
 };
 

src/Parser.cc

@@ -426,8 +426,9 @@ void Parser::set_game_name(std::string name) {
         std::replace(g->name.begin(), g->name.end(), ':', '-');
     }
 
-    if (!options.game_name_suffix.empty()) {
-        g->name += options.game_name_suffix;
+    auto suffix = options.name_suffix();
+    if (!suffix.empty()) {
+        g->name += suffix;
     }
 }