repoheat: comparison src/main.cpp

-:fa5f493adfb5
+:1ff88eb9555c
 static void print_help() {
 fputs(
 "Usage: repoheat [OPTION]... [PATH]...\n\n"
 "Options:\n"
-"   -a, --author <name>       Only report this author\n"
+"  -a, --author <name>          Only report this author\n"
-"                             (repeat option to report multiple authors)\n"
+"                               (repeat option to report multiple authors)\n"
-"   -A, --authormap <file>    Apply an author mapping file\n"
+"  -A, --authormap <file>       Apply an author mapping file\n"
-"       --csv                 Output the gathered data as CSV to stdout\n"
+"      --csv                    Output the gathered data as CSV to stdout\n"
-"       --csv-path <file>     Write CSV data to file instead of stdout\n"
+"      --csv-output <file>      Write CSV data to file instead of stdout\n"
-"   -d, --depth <num>         The search depth (default: 1, max: 255)\n"
+"  -d, --depth <num>            The search depth (default: 1, max: 255)\n"
-"   -f, --fragment [indent]   Output as fragment (HTML only)\n"
+"  -f, --fragment [indent]      Output as fragment (HTML only)\n"
-"   -h, --help                Print this help message\n"
+"  -h, --help                   Print this help message\n"
-"   -p, --pull                Try to pull the repositories\n"
+"  -o, --output <file>          Write output to file instead of stdout\n"
-"   -s, --separate            Output a separate heat map for each repository\n"
+"  -p, --pull                   Try to pull the repositories\n"
-"       --styles-and-script   Output the default CSS and Javascript and quit\n"
+"  -s, --separate               Output a separate heat map for each repository\n"
-"   -V, --version             Output the version of this program and exit\n"
+"  -S, --separate-output <file> Write results for -s to file instead of stdout\n"
-"   -y, --year <year>         The year for which to create the heat map\n"
+"      --styles-and-script      Output the default CSS and Javascript and quit\n"
-"       --hg <path>           Path to hg binary (default: /usr/bin/hg)\n"
+"  -V, --version                Output the version of this program and exit\n"
-"       --git <path>          Path to git binary (default: /usr/bin/git)\n\n"
+"  -y, --year <year>            The year for which to create the heat map\n"
+"      --hg <path>              Path to hg binary (default: /usr/bin/hg)\n"
+"      --git <path>             Path to git binary (default: /usr/bin/git)\n\n"
 "Scans all specified paths recursively for Mercurial and Git repositories and\n"
 "creates a commit heat map for the specified \033[1myear\033[22m or the current year.\n"
 "By default, the recursion \033[1mdepth\033[22m is one, meaning that this tool assumes that\n"
 "each \033[1mpath\033[22m is either a repository or contains repositories as subdirectories.\n"
 "You can change the \033[1mdepth\033[22m to support other directory structures.\n\n"
 "should \033[4monly\033[24m be used on the left-hand side. When you use the \033[1m--author\033[22m option at\n"
 "the same time, you only need to specify the new author names.\n\n"
 "Finally, this tool prints an HTML page to stdout. A separate heap map is\n"
 "generated for each author showing commits across all repositories, unless the\n"
 "\033[1m--separate\033[22m option is specified in which case each repository is displayed with\n"
-"its own heat map. By using the \033[1m--fragment\033[22m option, the tool only outputs a\n"
+"its own heat map.\n"
-"single HTML div container without any header or footer that can be embedded in\n"
+"If you use \033[1m--separate-output\033[22m you can specify a file instead, and both the\n"
-"your custom web page. You can optionally specify an indentation for that\n"
+"aggregated and separated heat maps are written. The aggregated output is still\n"
-"container (default is 0 and maximum is 12).\n"
+"written to stdout unless you specify a file with \033[1m--output\033[22m.\n"
+"By using the \033[1m--fragment\033[22m option, the tool only outputs a single HTML div\n"
+"container without any header or footer that can be embedded in your custom web\n"
+"page. You can optionally specify an indentation for that container (default is\n"
+"0 and maximum is 12).\n"
 "When you want to combine this with the default style and scripts, you can use\n"
 "the \033[1m--styles-and-script\033[22m option print the defaults to stdout and redirect them\n"
 "into a file when you are composing your custom HTML page.\n\n"
 "In case you want to work with the raw data, you can advise the tool to output\n"
 "the data in CSV format with the \033[1m--csv\033[22m option. The CSV data will be written to\n"
-"stdout instead of the HTML unless you specify a different file with \033[1m--csv-path\033[22m.\n"
+"stdout instead of the HTML. You can use \033[1m--csv-output\033[22m to specify a file, instead.\n"
 , stderr);
 }
 static bool chk_arg(const char *arg, const char *opt1, const char *opt2) {
 return strcmp(arg, opt1) == 0 || (opt2 != nullptr && strcmp(arg, opt2) == 0);
 fputs("missing author name\n", stderr);
 return -1;
 }
 } else if (chk_arg(argv[i], "--csv", nullptr)) {
 settings.csv = true;
-} else if (chk_arg(argv[i], "--csv-path", nullptr)) {
+} else if (chk_arg(argv[i], "--csv-output", nullptr)) {
-settings.csv = true;
+if (i + 1 < argc) {
-if (i + 1 < argc) {
+settings.csv = true;
 settings.csv_path.assign(argv[++i]);
 } else {
 fputs("missing csv path\n", stderr);
+return -1;
+}
+} else if (chk_arg(argv[i], "-o", "--output")) {
+if (i + 1 < argc) {
+settings.out_path.assign(argv[++i]);
+} else {
+fputs("missing output path\n", stderr);
 return -1;
 }
 } else if (chk_arg(argv[i], "-p", "--pull")) {
 settings.update_repos = true;
 } else if (chk_arg(argv[i], "-f", "--fragment")) {
 fputs("invalid fragment indentation\n", stderr);
 return -1;
 }
 } else if (chk_arg(argv[i], "-s", "--separate")) {
 settings.separate = true;
+} else if (chk_arg(argv[i], "-S", "--separate-output")) {
+if (i + 1 < argc) {
+settings.separate = true;
+settings.separate_path.assign(argv[++i]);
+} else {
+fputs("missing separate output path\n", stderr);
+return -1;
+}
 } else if (chk_arg(argv[i], "-A", "--authormap")) {
 if (i + 1 < argc) {
 if (settings.parse_authormap(argv[++i])) {
 fputs("parsing authormap failed\n", stderr);
 return -1;
 static void generate_html(
 const fm::settings &settings,
 year report_year, year_month_day report_begin, year_month_day report_end,
 const fm::heatmap &heatmap) {
+const auto &heatmap_data = settings.separate ? heatmap.separated() : heatmap.aggregated();
 html::open(settings.fragment, settings.fragment_indent);
-for (const auto &[repo, authors] : heatmap.data()) {
+for (const auto &[repo, authors] : heatmap_data) {
 bool h1_rendered = false;
 for (const auto &[author, entries] : authors) {
 if (settings.exclude_author(author)) continue;
 if (!h1_rendered) {
 html::heading_repo(repo);
 result += '"';
 return result;
 };
 fprintf(out, "repository,author,date,hash,summary,is_tag\n");
-for (const auto &authors: heatmap.data() | std::views::values) {
+for (const auto &authors: heatmap.aggregated() | std::views::values) {
 for (const auto &[author, entries]: authors) {
 for (const auto &[date, commits]: entries) {
 for (const auto &[repo, infos] : commits.summaries) {
 for (const auto &info : infos) {
 fprintf(out, "%s,%s,%d-%02u-%02u,%s,%s,false\n",
 return result < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 // check special options
 if (settings.styles_and_script) {
+// note: no need to set output path - not supported for styles and scripts
 html::styles_and_script();
 return 0;
 }
 // check hg and git
 };
 year_month_day report_begin{report_year, January, 1d};
 year_month_day report_end{report_year, December, 31d};
 // read the commit logs
-fm::heatmap heatmap{settings.separate};
+fm::heatmap heatmap;
 for (auto &&repo : repos.list()) {
 heatmap.set_repo(repo.name);
 proc.chdir(repo.path);
 if (repo.type == fm::HG) {
 proc.setbin(settings.hg);
 }
 heatmap.add(settings, proc.output());
 }
 }
-bool html = true;
+const bool write_csv = settings.csv;
-if (settings.csv) {
+const bool write_separate = settings.separate;
+const bool write_default = !settings.out_path.empty() || (
+!(write_csv && settings.csv_path.empty())
+&& !(write_separate && settings.separate_path.empty())
+);
+if (write_csv) {
 if (generate_csv(settings, heatmap)) {
+perror("Cannot open file for writing");
 return EXIT_FAILURE;
 }
-html = !settings.csv_path.empty();
+}
-}
+if (write_separate) {
-if (html) {
+settings.separate = true;
+if (html::set_output(settings.separate_path)) {
+perror("Cannot open file for writing");
+return EXIT_FAILURE;
+}
 generate_html(settings, report_year, report_begin, report_end, heatmap);
 }
+if (write_default) {
+settings.separate = false;
+if (html::set_output(settings.out_path)) {
+perror("Cannot open file for writing");
+return EXIT_FAILURE;
+}
+generate_html(settings, report_year, report_begin, report_end, heatmap);
+}
 return EXIT_SUCCESS;
 }

Mercurial > hg > repoheat / file comparison

comparison: src/main.cpp

src/main.cpp