tastytea
/
remwharead
1
0
Fork 0
Code Issues 1 Pull Requests Releases 37 Activity

Put tags that are used only once under the header “Less used tags”.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
tastytea 2019-05-28 21:40:26 +02:00
parent ee02b41622
commit 885148ea97
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
3 changed files with 72 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/adoc.cpp
View File

@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <map>
#include <regex>
#include <algorithm>
#include <utility>
@ -35,10 +34,11 @@ void export_adoc(const vector<Database::entry> &entries, ostream &out)
try
{
out << "= Visited things\n"
<< ":Author: remwharead " << global::version << endl
<< ":Date: " << timepoint_to_string(system_clock::now()) << endl
<< ":TOC: right" << endl
// << ":toc-title:" << endl
<< ":Author: remwharead " << global::version << endl
<< ":Date: "
<< timepoint_to_string(system_clock::now()) << endl
<< ":TOC: right" << endl
<< ":TOCLevels: 2" << endl
<< endl;
std::map<string,vector<Database::entry>> alltags;
@ -111,48 +111,7 @@ void export_adoc(const vector<Database::entry> &entries, ostream &out)
if (!alltags.empty())
{
out << "== Tags\n\n";
vector<tagpair> sortedtags(alltags.size());
std::move(alltags.begin(), alltags.end(), sortedtags.begin());
std::sort(sortedtags.begin(), sortedtags.end(),
[](const tagpair &a, tagpair &b)
{
if (a.second.size() != b.second.size())
{ // Sort by number of occurrences if they are
// different.
return a.second.size() > b.second.size();
}
else
{ // Sort by tag names otherwise.
std::locale loc;
const std::collate<char> &coll =
std::use_facet<std::collate<char>>(loc);
return (coll.compare(
a.first.data(), a.first.data()
+ a.first.length(),
b.first.data(), b.first.data()
+ b.first.length()) == -1);
}
});
for (const auto &tag : sortedtags)
{
out << "=== [[t_" << replace_in_tags(tag.first) << "]]"
<< tag.first << endl;
for (const Database::entry &entry : tag.second)
{
const string datetime = timepoint_to_string(entry.datetime);
const string date = datetime.substr(0, datetime.find('T'));
string title = entry.title;
if (title.empty())
{
title = "++" + entry.uri + "++";
}
out << endl << "* xref:dt_" << datetime
<< '[' << title << "] _(" << date << ")_" << endl;
}
out << endl;
}
adoc_print_tags(alltags, out);
}
}
catch (std::exception &e)
@ -192,3 +151,61 @@ const string replace_in_tags(string text)
}
return text;
}
void adoc_print_tags(const std::map<string,vector<Database::entry>> &tags,
ostream &out)
{
out << "== Tags\n\n";
vector<tagpair> sortedtags(tags.size());
std::move(tags.begin(), tags.end(), sortedtags.begin());
std::sort(sortedtags.begin(), sortedtags.end(),
[](const tagpair &a, tagpair &b)
{
if (a.second.size() != b.second.size())
{ // Sort by number of occurrences if they are different.
return a.second.size() > b.second.size();
}
else
{ // Sort by tag names otherwise.
std::locale loc;
const std::collate<char> &coll =
std::use_facet<std::collate<char>>(loc);
return (coll.compare(
a.first.data(), a.first.data()
+ a.first.length(),
b.first.data(), b.first.data()
+ b.first.length()) == -1);
}
});
bool othertags = false;
for (const auto &tag : sortedtags)
{
if (tag.second.size() == 1)
{
if (!othertags)
{
out << "=== Less used tags\n\n";
othertags = true;
}
out << "=";
}
out << "=== [[t_" << replace_in_tags(tag.first) << "]]"
<< tag.first << endl;
for (const Database::entry &entry : tag.second)
{
const string datetime = timepoint_to_string(entry.datetime);
const string date = datetime.substr(0, datetime.find('T'));
string title = entry.title;
if (title.empty())
{
title = "++" + entry.uri + "++";
}
out << endl << "* xref:dt_" << datetime
<< '[' << title << "] _(" << date << ")_" << endl;
}
out << endl;
}
out << endl;
}

4
src/export.hpp
View File

@ -19,6 +19,7 @@
#include <vector>
#include <iostream>
#include <map>
#include "sqlite.hpp"
using std::vector;
@ -32,9 +33,12 @@ const string quote_csv(string field);
void export_adoc(const vector<Database::entry> &entries, ostream &out = cout);
//! Replaces characters in tags that asciidoctor doesn't like.
const string replace_in_tags(string text);
void adoc_print_tags(const std::map<string,vector<Database::entry>> &tags,
ostream &out = cout);
//! Export as Netscape bookmark file.
void export_bookmarks(const vector<Database::entry> &entries,
ostream &out = cout);
#endif // REMWHAREAD_EXPORT_HPP

6
tests/test_adoc.cpp
View File

@ -54,7 +54,8 @@ SCENARIO ("The AsciiDoc export works correctly")
("^= Visited things\n"
":Author: +remwharead \\d+\\.\\d+\\.\\d+\n"
":Date: +\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\n"
":TOC: +right\n\n");
":TOC: +right\n"
":TOCLevels: +2\n\n");
const regex re_dates
("== 1970-01-01\n\n"
"\\[\\[dt_1970-01-01T\\d{2}:\\d{2}:\\d{2}\\]\\]\n"
@ -64,7 +65,8 @@ SCENARIO ("The AsciiDoc export works correctly")
"Good description\\.\n");
const regex re_tags
("== Tags\n\n"
"=== \\[\\[t_tag1\\]\\]tag1\n\n"
"=== Less used tags\n\n"
"==== \\[\\[t_tag1\\]\\]tag1\n\n"
"\\* xref:dt_1970-01-01T\\d{2}:\\d{2}:\\d{2}"
"\\[Nice title\\] _\\(1970-01-01\\)_\n\n");