Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Glabels-batch: allow project file to be provided on stdin. (#90)

Browse Source
This commit is contained in:
Jim Evins
2020-03-28 19:10:28 -04:00
parent 4a9f3aad8e
commit 142aaf2a92
5 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels-batch/main.cpp
+12 -2
View File
@@ -44,10 +44,13 @@ namespace
#if defined(Q_OS_WIN)
const QString STDOUT_FILENAME = "CON:";
const QString STDIN_FILENAME = "CON:";
#elif defined(Q_OS_LINUX)
const QString STDOUT_FILENAME = "/dev/stdout";
const QString STDIN_FILENAME = "/dev/stdin";
#else
const QString STDOUT_FILENAME = "/dev/stdout";
const QString STDIN_FILENAME = "/dev/stdin";
#endif
}
@@ -173,7 +176,14 @@ int main( int argc, char **argv )
if ( parser.positionalArguments().size() == 1 )
{
qDebug() << "Batch mode.";
QString filename = parser.positionalArguments().constFirst();
if ( filename == "-" )
{
filename = STDIN_FILENAME;
}
qDebug() << "Project file =" << filename;
glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
if ( model )
@@ -184,7 +194,7 @@ int main( int argc, char **argv )
printer.setColorMode( QPrinter::Color );
if ( parser.isSet("printer") )
{
qDebug() << "Batch mode. printer =" << parser.value("printer");
qDebug() << "Printer =" << parser.value("printer");
printer.setPrinterName( parser.value("printer") );
}
else if ( parser.isSet("output") )
@@ -194,7 +204,7 @@ int main( int argc, char **argv )
{
outputFilename = STDOUT_FILENAME;
}
qDebug() << "Batch mode. output =" << outputFilename;
qDebug() << "Output =" << outputFilename;
printer.setOutputFileName( outputFilename );
}
else
user-docs/_build/man/glabels-batch-qt.1
+5 -4
View File
@@ -1,8 +1,8 @@
.\" Man page generated from reStructuredText.
.
.TH "GLABELS-BATCH-QT" "1" "Jan 02, 2020" "" "gLabels"
.TH "GLABELS-BATCH-QT" "1" "Mar 28, 2020" "" "gLabels"
.SH NAME
glabels-batch-qt \- batch creation of labels and business cards
glabels-batch-qt \- print glabels project from command line
.
.nr rst2man-indent-level 0
.
@@ -32,11 +32,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
..
.SH SYNOPSIS
.sp
\fBglabels\-batch\-qt\fP [\fIoptions\fP] [\fIfilename\fP]
\fBglabels\-batch\-qt\fP [\fIoptions\fP] \fIFILE\fP
.SH DESCRIPTION
.sp
\fBglabels\-batch\-qt\fP is a utility for printing a glabels project file
from the command line. It is suitable for use with scripts.
from the command line. This command takes exactly one project file, FILE. If FILE
is "\-", it expects an XML glabels project to be provided on standard input.
.SH OPTIONS
.INDENT 0.0
.TP
user-docs/_build/man/glabels-qt.1
+1 -1
View File
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "GLABELS-QT" "1" "Jan 02, 2020" "" "gLabels"
.TH "GLABELS-QT" "1" "Mar 28, 2020" "" "gLabels"
.SH NAME
glabels-qt \- create labels and business cards
.
user-docs/conf.py
+1 -1
View File
@@ -150,7 +150,7 @@ latex_documents = [
# (source start file, name, description, authors, manual section).
man_pages = [
('man/glabels-qt', 'glabels-qt', 'create labels and business cards', [], 1),
('man/glabels-batch-qt', 'glabels-batch-qt', 'batch creation of labels and business cards', [], 1)
('man/glabels-batch-qt', 'glabels-batch-qt', 'print glabels project from command line', [], 1)
]
user-docs/man/glabels-batch-qt.rst
+3 -2
View File
@@ -4,13 +4,14 @@ glabels-batch-qt
SYNOPSIS
--------
**glabels-batch-qt** [*options*] [*filename*]
**glabels-batch-qt** [*options*] *FILE*
DESCRIPTION
-----------
:program:`glabels-batch-qt` is a utility for printing a glabels project file
from the command line. It is suitable for use with scripts.
from the command line. This command takes exactly one project file, FILE. If FILE
is "-", it expects an XML glabels project to be provided on standard input.
OPTIONS