[lmi-commits] [lmi] master b1f975b 2/2: Display number of tables merged

[Greg Chicares]

branch: master
commit b1f975be6c160660d8758dda86eb8e90b08cc1d5
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Display number of tables merged
    
    When merging a whole directory of '.txt' files, it is useful to show
    the number that were merged.
    
    This number is often one, so instead of saying "Merged 1 tables" or
    "Merged 1 table(s)" avoid the plural altogether, thus:
      "Number of tables merged: 1"
    Likewise, for concinnity, change the message extract_all() prints.
---
 rate_table_tool.cpp |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/rate_table_tool.cpp b/rate_table_tool.cpp
index 04000ee..0fead5d 100644
--- a/rate_table_tool.cpp
+++ b/rate_table_tool.cpp
@@ -133,6 +133,8 @@ void merge
         table_file.reset(new database);
         }
 
+    int count = 0;
+
     if(fs::is_directory(path_to_merge))
         {
         fs::directory_iterator i(path_to_merge);
@@ -142,15 +144,19 @@ void merge
             if(".txt" != fs::extension(*i)) continue;
             table const& t = table::read_from_text(*i);
             table_file->add_or_replace_table(t);
+            ++count;
             }
         }
     else
         {
         table const& t = table::read_from_text(path_to_merge);
         table_file->add_or_replace_table(t);
+        ++count;
         }
 
     table_file->save(database_filename);
+
+    std::cout << "Number of tables merged: " << count << "\n";
 }
 
 void delete_table
@@ -192,13 +198,13 @@ void extract_all(fs::path database_filename)
 {
     database const table_file(database_filename);
 
-    auto const tables_count = table_file.tables_count();
-    for(int i = 0; i != tables_count; ++i)
+    auto const count = table_file.tables_count();
+    for(int i = 0; i != count; ++i)
         {
         do_save_as_text_file(table_file.get_nth_table(i));
         }
 
-    std::cout << "Extracted " << tables_count << " tables.\n";
+    std::cout << "Number of tables extracted: " << count << "\n";
 }
 
 void rename_tables