Skip to content

Fix File → Export… → Games in filter action to export only games in the current filter #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AJWilderland wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix File → Export… → Games in filter action to export only games in the current filter #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/database/output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,14 +858,16 @@ void Output::postProcessOutput(QString& text) const
void Output::outputUtf8(QTextStream& out, FilterX& filter)
{
int percentDone = 0;
int doneCount = 0;
int totalCount = filter.count();
GameX game;
QString header = m_header;
postProcessOutput(header);
out << header;

for(int i = 0; i < filter.count(); ++i)
for(int i = 0, sz = filter.size(); i < sz; ++i)
{
if(filter.database()->loadGame(i, game))
if(filter.contains(i) && filter.database()->loadGame(i, game))
{
QString tagText = outputTags(&game);
out << tagText;
Expand All @@ -874,8 +876,10 @@ void Output::outputUtf8(QTextStream& out, FilterX& filter)
postProcessOutput(outText);
out << outText;
out << "\n\n";

doneCount++;
}
int percentDone2 = (i + 1) * 100 / filter.count();
int percentDone2 = doneCount * 100 / totalCount;
if(percentDone2 > percentDone)
{
emit progress((percentDone = percentDone2));
Expand All @@ -890,15 +894,17 @@ void Output::outputUtf8(QTextStream& out, FilterX& filter)
void Output::outputLatin1(QDataStream& out, FilterX& filter)
{
int percentDone = 0;
int doneCount = 0;
int totalCount = filter.count();
GameX game;
QString header = m_header;
postProcessOutput(header);
QByteArray b = header.toLatin1();
out.writeRawData(b, b.length());

for(int i = 0; i < filter.count(); ++i)
for(int i = 0, sz = filter.size(); i < sz; ++i)
{
if(filter.database()->loadGame(i, game))
if(filter.contains(i) && filter.database()->loadGame(i, game))
{
QString tagText = outputTags(&game);
b = tagText.toLatin1();
Expand All @@ -909,8 +915,10 @@ void Output::outputLatin1(QDataStream& out, FilterX& filter)
outText.append("\n\n");
b = outText.toLatin1();
out.writeRawData(b, b.length());

doneCount++;
}
int percentDone2 = (i + 1) * 100 / filter.count();
int percentDone2 = doneCount * 100 / totalCount;
if(percentDone2 > percentDone)
{
emit progress((percentDone = percentDone2));
Expand Down