build pipeline has no println in libfmt version...

This branch fixes a couple of issues with the build
- stop linking everything in a library which is then linked against a single main. It doesn't work the way I wanted. If functionality needs to be exposed by a library, it can be done later or with a separate target
- This should also fix spdlog
- Source files are now in a separate meson file using mesons files() feautre
- Improve coverage generation by adding a script generating html coverage reports. This will hopefully keep the motivation higher to create more unit tests
- Increase the code coverage a bit to demonstrate that statement above is not a fluke 😄

Reviewed-on: #7

.clang-tidy

@@ -0,0 +1,35 @@
+---
+Checks: "clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,modernize-*,-modernize-use-trailing-return-type"
+WarningsAsErrors: true
+HeaderFilterRegex: ""
+AnalyzeTemporaryDtors: false
+FormatStyle: google
+CheckOptions:
+  - key: cert-dcl16-c.NewSuffixes
+    value: "L;LL;LU;LLU"
+  - key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField
+    value: "0"
+  - key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors
+    value: "1"
+  - key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
+    value: "1"
+  - key: google-readability-braces-around-statements.ShortStatementLines
+    value: "1"
+  - key: google-readability-function-size.StatementThreshold
+    value: "800"
+  - key: google-readability-namespace-comments.ShortNamespaceLines
+    value: "10"
+  - key: google-readability-namespace-comments.SpacesBeforeComments
+    value: "2"
+  - key: modernize-loop-convert.MaxCopySize
+    value: "16"
+  - key: modernize-loop-convert.MinConfidence
+    value: reasonable
+  - key: modernize-loop-convert.NamingStyle
+    value: CamelCase
+  - key: modernize-pass-by-value.IncludeStyle
+    value: llvm
+  - key: modernize-replace-auto-ptr.IncludeStyle
+    value: llvm
+  - key: modernize-use-nullptr.NullMacros
+    value: "NULL"

.gitea/workflows/build.yaml

@@ -0,0 +1,27 @@
+name: Build ptprnt
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Starting action...
+        run: echo "Branch ${{ gitea.ref }} will be built for project ${{ gitea.repository }}."
+      - name: Checkout branch
+        uses: actions/checkout@v3
+      - name: Update package cache
+        run: apt-get update
+      - name: install meson
+        run: apt-get -yq install meson
+      - name: Install build dependencies
+        run: apt-get -yq install libusb-1.0-0-dev libspdlog-dev libfmt-dev libpango1.0-dev libcairo2-dev gcovr
+      - name: setup builddir
+        run: meson setup builddir -Db_coverage=true
+      - name: build all targets
+        run: ninja -C builddir
+      - name: run unit tests
+        run: ninja -C builddir test
+      - name: calculate coverage
+        run: ninja -C builddir coverage-text
+      - name: Coverage report
+        run: cat ./builddir/meson-logs/coverage.txt

.gitignore

@@ -1,9 +1,13 @@
+# Folder
 builddir/
+ptouch-print/
 subprojects/*
-!subprojects/*.wrap
 .cache/
+coverageReport/
+
+# Files
+!subprojects/*.wrap
 .vscode/*
 !.vscode/c_cpp_properties.json
 !.vscode/settings.json
 !.vscode/launch.json
-ptouch-print/

.vscode/launch.json

@@ -9,7 +9,7 @@
       "type": "cppdbg",
       "request": "launch",
       "program": "${workspaceFolder}/builddir/ptprnt",
-      "args": [],
+      "args": ["-t Hello"],
       "stopAtEntry": false,
       "cwd": "${fileDirname}",
       "environment": [],

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -0,0 +1,61 @@
+# ptprnt
+
+This is a rewrite of [ptouch-print](https://git.familie-radermacher.ch/linux/ptouch-print.git) as a toy project for my personal amusement. The currently available solutions are good enough for generating labels, but i wanted to explore libusb and maybe improve the functionality of my label printer. All credits for reverse engineering the USB commands to Dominic Rademacher.
+
+## Dependencies
+This project requires:
+- spdlog
+- libusb
+- pango
+- cairo
+- meson
+- gtest (optional, for testing, will be installed by meson)
+- gcov (optional, for coverage reports)
+
+Install dependencies on Arch Linux
+``` bash
+pacman -S libusb spdlog pango cairo meson gcovr
+```
+
+Install dependencies on Debian/Ubuntu
+``` bash
+apt-get install libusb-1.0-0-dev libspdlog-dev libfmt-dev libpango1.0-dev libcairo2-dev meson gcovr
+```
+
+## Build
+
+Clone the repository and simply let meson do the heavy lifting.
+
+```bash
+meson setup builddir 
+```
+If you want to generate coverage reports, enable them via the command line switch
+```bash 
+meson setup builddir -Db_coverage=true
+```
+
+Rebuild by simply invoking ninja
+```bash
+ninja -C builddir
+```
+
+## Run
+Run the binary from your builddir
+```bash 
+builddir/ptprnt
+```
+
+## Test
+Testing is done via gtest. To run your test simply invoke ninja with the "test" target.
+```bash
+ninja -C builddir test   
+```
+
+Coverage reports can be generated via gcov if you enabled them (see Build section) by building the `coverage-text` target.
+
+## License
+
+GPLv3, see [LICENSE](./LICENSE)
+
+## Author
+Moritz Martinius <moritz@admiralackbar.de>

generate_coverage.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+HTML_COV_PATH="coverageReport/html"
+HTML_START_FILE="index.html"
+
+echo "Generating Coverage report for ptouch-prnt"
+
+ninja -C builddir
+ninja -C builddir test
+
+mkdir -p ${HTML_COV_PATH}
+gcovr --html --html-details --html-syntax-highlighting --filter src --output ${HTML_COV_PATH}/${HTML_START_FILE}
+
+if [ $? ] 
+then
+  echo "Coverage report successful generated!"
+  echo "Open: file://${SCRIPT_PATH}/${HTML_COV_PATH}/${HTML_START_FILE}"
+else
+  echo "Error generating coverage report!"
+fi

meson.build

@@ -1,60 +1,39 @@
 project('ptprnt', 'cpp',
-    version: 'v0.1.0-'+run_command('git', 'rev-parse',  '--short', 'HEAD').stdout().strip(),
+    version: 'v0.1.0-'+run_command('git', 'rev-parse',  '--short', 'HEAD', check: true).stdout().strip(),
     license: 'GPLv3',
     default_options : ['c_std=c11', 'cpp_std=c++17']    
 )
 
 usb_dep = dependency('libusb-1.0')
 log_dep = dependency('spdlog')
+fmt_dep = dependency('fmt')
 pangocairo_dep = dependency('pangocairo')
 
+# CLI11 
+cli11_proj = subproject('cli11')
+cli11_dep = cli11_proj.get_variable('CLI11_dep')
+if not cli11_dep.found()
+    error('CLI11 not found, can not proceed')
+endif
+
 incdir = include_directories('src')
 
-ptprnt_hpps = [
+subdir('src')
-    'src/libusbwrap/interface/IUsbDeviceFactory.hpp',
-    'src/libusbwrap/interface/IUsbDevice.hpp',
-    'src/libusbwrap/UsbDeviceFactory.hpp',
-    'src/libusbwrap/LibUsbTypes.hpp',
-    'src/libusbwrap/UsbDevice.hpp',
-    'src/interface/IPrinterDriver.hpp',
-    'src/interface/IPrinterTypes.hpp',
-    'src/P700Printer.hpp',
-    'src/PtouchPrint.hpp',
-    'src/graphics/Bitmap.hpp',
-    'src/graphics/Image.hpp',
-    'src/graphics/Monochrome.hpp'
-]
 
-ptprnt_srcs = [
+ptprnt_exe = executable(
-    'src/PtouchPrint.cpp',
-    'src/P700Printer.cpp',
-    'src/graphics/Image.cpp',
-    'src/graphics/Bitmap.cpp',
-    'src/graphics/Monochrome.cpp',
-    'src/libusbwrap/UsbDeviceFactory.cpp',
-    'src/libusbwrap/UsbDevice.cpp',
-]
-
-ptprnt_lib = library('ptprnt', 
-                     include_directories: incdir,
-                     install: true,
-                     dependencies: [usb_dep, log_dep, pangocairo_dep],
-                     sources: [ptprnt_hpps, ptprnt_srcs])
-
-ptprnt_dep = declare_dependency(include_directories: incdir,
-                                link_with: ptprnt_lib)
-
-ptprnt_debug_exe = executable(
     'ptprnt', 
     'src/main.cpp',
     install: true,
-    dependencies : [usb_dep, log_dep, ptprnt_dep],
+    dependencies : [usb_dep, log_dep, fmt_dep, pangocairo_dep, cli11_dep],
-    cpp_args : ['-DPROJ_VERSION="'+meson.project_version()+'"']
+    include_directories: incdir,
+    sources: [ptprnt_srcs],
+    cpp_args : ['-DPROJ_VERSION="'+meson.project_version()+'"'],
 )
 
 
+### Unit tests
 
-#cmake = import('cmake')
+# GTest
 gtest_proj = subproject('gtest')
 gtest_dep = gtest_proj.get_variable('gtest_main_dep')
 if not gtest_dep.found()

src/P700Printer.cpp

@@ -1,23 +1,45 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "P700Printer.hpp"
 
+#include <algorithm>
 #include <spdlog/spdlog.h>
 
-#include <array>
-#include <chrono>
 #include <cstdint>
 #include <iostream>
+#include <iterator>
 #include <ratio>
 #include <thread>
 #include <vector>
 
+#include "graphics/Bitmap.hpp"
 #include "graphics/Image.hpp"
+#include "graphics/Monochrome.hpp"
 #include "libusb.h"
 #include "libusbwrap/LibUsbTypes.hpp"
 #include "spdlog/fmt/bin_to_hex.h"
 
-namespace ptprnt::printer {
+// as long as DRYRUN is defined, no data is actually send to the printer, we need to save some tape ;)
+//#define DRYRUN
 
-P700Printer::P700Printer() {}
+namespace ptprnt::printer {
 
 P700Printer::~P700Printer() {
     detachUsbDevice();
@@ -50,13 +72,10 @@ const PrinterStatus P700Printer::getPrinterStatus() {
     int tx    = 0;
     int tries = 0;
     std::vector<uint8_t> recvBuf(32);
-    do {
+    while (tries++ < MAX_TRIES_GET_STATUS) {
         std::this_thread::sleep_for(100ms);
-        mUsbHndl->bulkTransfer(0x81, recvBuf, &tx, 0);
+        mUsbHndl->bulkTransfer(commands["printerinfo"][0], recvBuf, &tx, 0);
-        if (tries++ > 10) {
+    }
-            break;
-        }
-    } while (tx == 0);
 
     return PrinterStatus{.tapeWidthMm = recvBuf[10]};
 }
@@ -103,26 +122,39 @@ bool P700Printer::detachUsbDevice() {
 }
 
 bool P700Printer::printBitmap(const graphics::Bitmap<graphics::ALPHA8>& bitmap) {
-    auto img = graphics::Image();
+    auto bm = graphics::Bitmap<graphics::ALPHA8>(512, 128);
-    //uint8_t* imgRef = img.getRaw();
+    {
-    std::array<uint32_t, 4> line;
+        auto img = graphics::Image();
+        bm.setPixels(std::vector<uint8_t>(img.getRaw(), img.getRaw() + 512 * 128));
+    }
 
     send(commands["rasterstart"]);
-    std::vector<uint8_t> buf(64);
-    buf[0] = 0x47;
-    for (int i = 0; i < 8; i++) {
-        if (i % 2) {
-            line.fill(0xffffffff);
-        } else {
-            line.fill(0x00000000);
-        }
 
-        buf[1] = (uint8_t)(8 + 1);
+    std::vector<uint8_t> rastercmd(4);
-        buf[2] = 0;
+    rastercmd[0] = 0x47;
-        buf[3] = (uint8_t)(8 - 1);
+    rastercmd[1] = 0x00;  // size +1
-        memcpy(buf.data() + 4, line.data(), line.size());
+    rastercmd[2] = 0x00;
-        send(buf);
+    rastercmd[3] = 0x00;  // size -1
+    for (unsigned int i = 0; i < bm.getWidth(); i++) {
+        auto bmcol = bm.getCol(i);
+        if (!bmcol) {
+            spdlog::error("Out of bounds bitmap access");
+            break;
+        }
+        auto monocol = graphics::Monochrome(*bmcol);
+        auto col     = monocol.get();
+
+        std::vector<uint8_t> buf(0);
+        buf.insert(buf.begin(), rastercmd.begin(), rastercmd.end());
+        buf.insert(std::next(buf.begin(), 4), col.begin(), col.end());
+
+        buf[1] = col.size() + 1;
+        buf[3] = col.size() - 1;
+        if (!send(buf)) {
+            break;
+        };
     }
+
     send(commands["eject"]);
     return true;
 }
@@ -140,10 +172,24 @@ bool P700Printer::send(std::vector<uint8_t>& data) {
         spdlog::error("Invalid device handle or invalid data.");
         return false;
     }
-    if (!mUsbHndl->bulkTransfer(0x02, data, nullptr, 0)) {
+
+    int tx = 0;
+
+#ifndef DRYRUN
+    if (!mUsbHndl->bulkTransfer(0x02, data, &tx, 0)) {
         spdlog::error("Error writing command to Printer: {}", mUsbHndl->getLastErrorString());
         return false;
     }
+#else
+    tx = data.size();
+    spdlog::debug("USB raw data(len {}): {}", data.size(), spdlog::to_hex(data));
+#endif
+
+    if (tx != static_cast<int>(data.size())) {
+        spdlog::error("Could not transfer all data via USB bulk transfer. Only send {} of {} bytes",
+                      tx, data.size());
+        return false;
+    }
 
     return true;
 }

src/P700Printer.hpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include <sys/types.h>
 
 #include <map>
@@ -12,14 +31,18 @@
 
 namespace ptprnt::printer {
 
+constexpr uint8_t MAX_TRIES_GET_STATUS = 10;
+
 class P700Printer : public ::ptprnt::IPrinterDriver {
    public:
-    P700Printer();
+    P700Printer() = default;
     ~P700Printer();
 
     // delete copy ctor and assignment
-    P700Printer(const P700Printer&)      = delete;
+    P700Printer(const P700Printer&)            = default;
-    P700Printer& operator=(P700Printer&) = delete;
+    P700Printer& operator=(const P700Printer&) = default;
+    P700Printer(P700Printer&&)                 = default;
+    P700Printer& operator=(P700Printer&&)      = default;
 
     // IPrinterDriver
     const std::string_view getDriverName() override;
@@ -40,19 +63,21 @@ class P700Printer : public ::ptprnt::IPrinterDriver {
 
     std::shared_ptr<libusbwrap::IUsbDevice> mUsbHndl{nullptr};
 
-    PrinterInfo mInfo{.driverName = "P700",
+    static constexpr PrinterInfo mInfo{.driverName = "P700",
-                      .name       = "Brother P-touch P700",
+                                       .name       = "Brother P-touch P700",
-                      .version    = "v1.0",
+                                       .version    = "v1.0",
-                      .vid        = 0x04f9,
+                                       .vid        = 0x04f9,
-                      .pid        = 0x2061};
+                                       .pid        = 0x2061};
     std::map<std::string, std::vector<uint8_t>> commands{
-        {"rasterstart", {0x1b, 0x69, 0x52, 0x01}},
+        {"rasterstart",
+         {0x1b, 0x69, 0x61,
+          0x01}},  // unique for P700, other printers have the 2 byte set to 0x52 instead of 0x61
         {"info", {0x1b, 0x69, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
         {"packbitson", {0x02}},
         {"lf", {0x5a}},
         {"ff", {0x0c}},
         {"eject", {0x1a}},
-    };
+        {"printerinfo", {0x81}}};
 };
 
 }  // namespace ptprnt::printer

src/PtouchPrint.cpp

@@ -1,29 +1,85 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE
+#define SPDLOG_DEBUG_ON
+#define SPDLOG_TRACE_ON
+
 #include "PtouchPrint.hpp"
 
+#include <CLI/App.hpp>
+#include <fmt/core.h>
+#include <spdlog/common.h>
+#include <spdlog/details/synchronous_factory.h>
+#include <spdlog/logger.h>
+#include <spdlog/sinks/base_sink.h>
+#include <spdlog/sinks/basic_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
 
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "CLI/Option.hpp"
 #include "P700Printer.hpp"
 #include "graphics/Bitmap.hpp"
 #include "libusbwrap/UsbDeviceFactory.hpp"
 
-PtouchPrint::PtouchPrint() {}
+namespace ptprnt {
 
-PtouchPrint::~PtouchPrint() {}
+PtouchPrint::PtouchPrint(const char* versionString) : mVersionString{versionString} {}
 
-void PtouchPrint::init() {
+int PtouchPrint::init(int argc, char** argv) {
-    mUsbDeviceFactory.init();
+    setupCliParser();
+
+    try {
+        mApp.parse(argc, argv);
+    } catch (const CLI::ParseError& e) {
+        mApp.exit(e);
+        return -1;
+    }
+
+    if (mVerboseFlag) {
+        setupLogger(spdlog::level::debug);
+    } else {
+        setupLogger(spdlog::level::err);
+    }
+
+    if (!mUsbDeviceFactory.init()) {
+        spdlog::error("Could not initialize libusb");
+        return -1;
+    }
     mCompatiblePrinters = {std::make_shared<ptprnt::printer::P700Printer>()};
+    return 0;
 }
 
-void PtouchPrint::run() {
+int PtouchPrint::run() {
+    spdlog::debug("ptprnt version {}", mVersionString);
+    SPDLOG_TRACE("testing trace");
     auto numFoundPrinters = getCompatiblePrinters();
     if (numFoundPrinters == 0) {
         spdlog::error(
-            "No compatible printers found, please make sure if they are turned on and connected");
+            "No compatible printers found, please make sure that they are turned on and connected");
-        return;
+        return -1;
     } else if (numFoundPrinters > 1) {
         spdlog::warn("Found more than one compatible printer. Currently not supported.");
-        return;
+        return -1;
     }
 
     auto printer = mCompatiblePrinters[0];
@@ -31,14 +87,20 @@ void PtouchPrint::run() {
     if (devices.size() != 1) {
         spdlog::warn(
             "Found more than one device of the same printer on bus. Currently not supported");
-        return;
+        return -1;
     }
     printer->attachUsbDevice(devices[0]);
     auto status = printer->getPrinterStatus();
     spdlog::info("Detected tape width is {}mm", status.tapeWidthMm);
     auto bm = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(512, 128);
-    printer->printBitmap(bm);
+    //printer->printBitmap(bm);
     //printer->printText("wurst", 1);
+
+    for (auto& cmd : mCommands) {
+        spdlog::debug("Command: {}", cmd.second);
+    }
+
+    return 0;
 }
 
 unsigned int PtouchPrint::getCompatiblePrinters() {
@@ -62,3 +124,61 @@ unsigned int PtouchPrint::getCompatiblePrinters() {
     mCompatiblePrinters.clear();
     return mDetectedPrinters.size();
 }
+
+void PtouchPrint::setupLogger(spdlog::level::level_enum lvl) {
+    auto consoleSink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    consoleSink->set_level(lvl);
+    consoleSink->set_pattern("%^%L:%$ %v");
+
+    auto fileSink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("ptprnt.log", true);
+    fileSink->set_level(spdlog::level::trace);
+    fileSink->set_pattern("%Y-%m-%d %H:%m:%S:%e [pid:%P tid:%t] [%^%l%$] %v (%@)");
+    std::vector<spdlog::sink_ptr> sinks{consoleSink, fileSink};
+    auto logger = std::make_shared<spdlog::logger>("default_logger", sinks.begin(), sinks.end());
+    logger->set_level(spdlog::level::trace);
+    spdlog::set_default_logger(logger);
+}
+
+void PtouchPrint::setupCliParser() {
+    auto printVersion = [this](std::size_t) {
+        fmt::print("ptprnt version: {}\n", mVersionString);
+    };
+
+    // General options
+    mApp.add_flag("-v,--verbose", mVerboseFlag, "Enable verbose output");
+    mApp.add_flag("-V,--version", printVersion, "Prints the ptprnt's version");
+
+    // Text printing options
+    mApp.add_option("-t,--text",
+                    "Text to print (can be used multple times, use formatting options before to "
+                    "influence text layout)")
+        ->group("Printing")
+        ->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
+        ->trigger_on_parse()
+        ->each([this](std::string text) { mCommands.emplace_back(CliCmdType::Text, text); });
+    mApp.add_option("-f,--font", "Font used for the following text occurences")
+        ->group("Text printing ")
+        ->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
+        ->trigger_on_parse()
+        ->each([this](std::string font) { mCommands.emplace_back(CliCmdType::Font, font); });
+    mApp.add_option("-s,--fontsize", "Font size of the following text occurences")
+        ->group("Text printing ")
+        ->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
+        ->trigger_on_parse()
+        ->each([this](std::string size) { mCommands.emplace_back(CliCmdType::FontSize, size); });
+    mApp.add_option("--valign", "Vertical alignment of the following text occurences")
+        ->group("Text printing ")
+        ->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
+        ->trigger_on_parse()
+        ->each([this](std::string valign) { mCommands.emplace_back(CliCmdType::VAlign, valign); });
+    mApp.add_option("--halign", "Vertical alignment of the following text occurences")
+        ->group("Text printing ")
+        ->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
+        ->trigger_on_parse()
+        ->each([this](std::string halign) { mCommands.emplace_back(CliCmdType::HAlign, halign); });
+
+    // Image options
+    mApp.add_option("-i,--image", "Image to print. Excludes all text printing ")
+        ->group("Image printing");
+}
+}  // namespace ptprnt

src/PtouchPrint.hpp

@@ -1,22 +1,65 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #pragma once
 
+#include <CLI/CLI.hpp>
+#include <spdlog/common.h>
+#include <spdlog/spdlog.h>
+
+#include "constants.hpp"
 #include "interface/IPrinterDriver.hpp"
 #include "libusbwrap/UsbDeviceFactory.hpp"
 
+namespace ptprnt {
+enum class CliCmdType { None = 0, Text = 1, FontSize = 2, Font = 3, VAlign = 4, HAlign = 5 };
+using CliCmd = std::pair<CliCmdType, std::string>;
+
 class PtouchPrint {
    public:
-    PtouchPrint();
+    PtouchPrint(const char* versionString);
-    ~PtouchPrint();
+    ~PtouchPrint() = default;
 
-    void init();
+    // This is basically a singelton application class, no need to copy or move
-    void run();
+    PtouchPrint(const PtouchPrint&)            = delete;
+    PtouchPrint& operator=(const PtouchPrint&) = delete;
+    PtouchPrint(PtouchPrint&&)                 = delete;
+    PtouchPrint& operator=(PtouchPrint&&)      = delete;
+
+    int init(int argc, char** argv);
+    int run();
 
    private:
     // methods
+    void setupLogger(spdlog::level::level_enum lvl);
+    void setupCliParser();
     unsigned int getCompatiblePrinters();
 
     // member variables
-    libusbwrap::UsbDeviceFactory mUsbDeviceFactory;
+    CLI::App mApp{ptprnt::APP_DESC};
-    std::vector<std::shared_ptr<ptprnt::IPrinterDriver>> mCompatiblePrinters;
+    libusbwrap::UsbDeviceFactory mUsbDeviceFactory{};
-    std::vector<std::shared_ptr<ptprnt::IPrinterDriver>> mDetectedPrinters;
+    std::vector<std::shared_ptr<ptprnt::IPrinterDriver>> mCompatiblePrinters{};
+    std::vector<std::shared_ptr<ptprnt::IPrinterDriver>> mDetectedPrinters{};
+    std::vector<CliCmd> mCommands{};
+    std::string mVersionString = "";
+
+    // CLI flags
+    bool mVerboseFlag = false;
 };
+}  // namespace ptprnt

src/constants.hpp

@@ -0,0 +1,26 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
+#pragma once
+
+namespace ptprnt {
+constexpr const char* const APP_NAME = "ptprnt";
+constexpr const char* const APP_DESC =
+    "ptprnt - a userspace driver for Brother P-touch label printer";
+}  // namespace ptprnt

src/graphics/Bitmap.cpp

@@ -1,6 +1,26 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "Bitmap.hpp"
 
 #include <algorithm>
+#include <spdlog/spdlog.h>
 
 #include <iterator>
 #include <optional>
@@ -21,6 +41,22 @@ uint16_t Bitmap<T>::getHeight() {
     return mHeight;
 }
 
+template <class T>
+bool Bitmap<T>::setPixels(const std::vector<T>& pixels) {
+    if (pixels.size() != mPixels.size()) {
+        spdlog::error("Invalid pixel buffer size.");
+        return false;
+    }
+
+    mPixels = pixels;
+    return true;
+}
+
+template <class T>
+std::vector<T> Bitmap<T>::getPixelsCpy() {
+    return mPixels;
+}
+
 template <class T>
 std::optional<std::vector<T>> Bitmap<T>::getLine(uint16_t line) {
     if (line >= mHeight) {
@@ -34,22 +70,22 @@ std::optional<std::vector<T>> Bitmap<T>::getLine(uint16_t line) {
 }
 
 template <class T>
-std::optional<std::vector<T>> Bitmap<T>::getRow(uint16_t row) {
+std::optional<std::vector<T>> Bitmap<T>::getCol(uint16_t col) {
-    if (row >= mWidth) {
+    if (col >= mWidth) {
         // out of bound
         return std::nullopt;
     }
 
-    // first pixel is always beginning of the row
+    // first pixel is always beginning of the col
-    std::vector<T> rowPixels(mHeight);
+    std::vector<T> colPixels(mHeight);
-    auto it = mPixels.begin() + row;
+    auto it = std::next(mPixels.begin(), col);
 
-    for (auto& rowElement : rowPixels) {
+    for (auto& colElement : colPixels) {
-        rowElement = *it;
+        colElement = *it;
-        it += mWidth;
+        std::advance(it, mWidth);
     }
 
-    return rowPixels;
+    return colPixels;
 }
 
 }  // namespace ptprnt::graphics

src/graphics/Bitmap.hpp

@@ -1,8 +1,28 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #pragma once
 
 #include <stdint.h>
 
 #include <cstdint>
+#include <memory>
 #include <optional>
 #include <vector>
 
@@ -21,8 +41,10 @@ class Bitmap {
 
     uint16_t getWidth();
     uint16_t getHeight();
+    bool setPixels(const std::vector<T>& pixels);
+    std::vector<T> getPixelsCpy();
     std::optional<std::vector<T>> getLine(uint16_t line);
-    std::optional<std::vector<T>> getRow(uint16_t row);
+    std::optional<std::vector<T>> getCol(uint16_t col);
 
    private:
     uint16_t mWidth;

src/graphics/Image.cpp

@@ -1,28 +1,52 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "Image.hpp"
 
+#include <string>
+
 #include "pango/pango-font.h"
 
 namespace ptprnt::graphics {
 Image::Image() {
-    mSurface         = cairo_image_surface_create(CAIRO_FORMAT_A1, 512, 128);
+    mSurface         = cairo_image_surface_create(CAIRO_FORMAT_A8, 512, 128);
     cairo_t* cr      = cairo_create(mSurface);
     mFontDescription = pango_font_description_new();
     pango_font_description_set_family(mFontDescription, "sans");
     pango_font_description_set_weight(mFontDescription, PANGO_WEIGHT_SEMIBOLD);
     pango_font_description_set_size(mFontDescription, 60 * PANGO_SCALE);
 
+    std::string printThis("Mist 💩");
+
     mLayout = pango_cairo_create_layout(cr);
     pango_layout_set_font_description(mLayout, mFontDescription);
-    pango_layout_set_text(mLayout, "Hello, world", -1);
+    pango_layout_set_text(mLayout, printThis.c_str(), -1);
 
     cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
-    cairo_move_to(cr, 10.0, 94.0);
+    cairo_move_to(cr, 0.0, 94.0);
     pango_cairo_show_layout_line(cr, pango_layout_get_line(mLayout, 0));
 
     cairo_surface_write_to_png(mSurface, "hello.png");
 }
 
 uint8_t* Image::getRaw() {
+    cairo_surface_flush(mSurface);
     return cairo_image_surface_get_data(mSurface);
 }
 

src/graphics/Image.hpp

@@ -1,3 +1,24 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
+#pragma once
+
 #include <pango/pangocairo.h>
 
 #include <cstdint>

src/graphics/Monochrome.cpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "graphics/Monochrome.hpp"
 
 #include <cmath>

src/graphics/Monochrome.hpp

@@ -1,3 +1,24 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
+#pragma once
+
 #include <cstdint>
 
 #include "graphics/Bitmap.hpp"

src/interface/IPrinterDriver.hpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #pragma once
 
 #include <memory>
@@ -11,6 +30,7 @@ namespace ptprnt {
 
 class IPrinterDriver {
    public:
+    virtual ~IPrinterDriver()                                                     = default;
     virtual const std::string_view getDriverName()                                = 0;
     virtual const std::string_view getName()                                      = 0;
     virtual const std::string_view getVersion()                                   = 0;

src/interface/IPrinterTypes.hpp

@@ -1,3 +1,21 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
 
 #pragma once
 

src/libusbwrap/LibUsbTypes.hpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #pragma once
 
 #include <memory>

src/libusbwrap/UsbDevice.cpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "libusbwrap/UsbDevice.hpp"
 
 #include <cstdint>

src/libusbwrap/UsbDevice.hpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #pragma once
 
 #include <atomic>
@@ -10,8 +29,8 @@
 namespace libusbwrap {
 class UsbDevice : public IUsbDevice {
    public:
-    UsbDevice(libusb_context* ctx, libusb_device* dev);
+    explicit UsbDevice(libusb_context* ctx, libusb_device* dev);
-    ~UsbDevice();
+    ~UsbDevice() override;
 
     // delete copy ctor and assignment
     UsbDevice(const UsbDevice&)      = delete;

src/libusbwrap/UsbDeviceFactory.cpp

@@ -1,3 +1,21 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
 
 #include "libusbwrap/UsbDeviceFactory.hpp"
 
@@ -11,10 +29,11 @@
 #include "libusbwrap/interface/IUsbDevice.hpp"
 
 namespace libusbwrap {
-UsbDeviceFactory::UsbDeviceFactory() {}
 
 UsbDeviceFactory::~UsbDeviceFactory() {
-    libusb_free_device_list(mLibusbDeviceList, 1);
+    if (mDeviceListInitialized) {
+        libusb_free_device_list(mLibusbDeviceList, 1);
+    }
 }
 
 std::vector<std::shared_ptr<IUsbDevice>> UsbDeviceFactory::findAllDevices() {
@@ -34,7 +53,7 @@ int UsbDeviceFactory::refreshDeviceList() {
     } else if (ret == 0) {
         spdlog::warn("No USB devices found");
     }
-
+    mDeviceListInitialized = true;
     return ret;
 }
 

src/libusbwrap/UsbDeviceFactory.hpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #pragma once
 
 #include "libusbwrap/interface/IUsbDeviceFactory.hpp"
@@ -5,12 +24,14 @@
 namespace libusbwrap {
 class UsbDeviceFactory : public IUsbDeviceFactory {
    public:
-    UsbDeviceFactory();
+    UsbDeviceFactory() = default;
-    ~UsbDeviceFactory();
+    virtual ~UsbDeviceFactory();
 
     // delete copy ctor and assignment
-    UsbDeviceFactory(const UsbDeviceFactory&)      = delete;
+    UsbDeviceFactory(const UsbDeviceFactory&)       = delete;
-    UsbDeviceFactory& operator=(UsbDeviceFactory&) = delete;
+    UsbDeviceFactory& operator=(UsbDeviceFactory&)  = delete;
+    UsbDeviceFactory(UsbDeviceFactory&&)            = delete;
+    UsbDeviceFactory& operator=(UsbDeviceFactory&&) = delete;
 
     bool init();
     /**
@@ -37,6 +58,7 @@ class UsbDeviceFactory : public IUsbDeviceFactory {
                                                                      uint16_t pid);
     // members
     libusb_context* mLibusbCtx{nullptr};
-    libusb_device** mLibusbDeviceList;
+    libusb_device** mLibusbDeviceList{};
+    bool mDeviceListInitialized = false;
 };
 }  // namespace libusbwrap

src/libusbwrap/interface/IUsbDevice.hpp

@@ -24,8 +24,9 @@ enum class Speed {
 
 class IUsbDevice {
    public:
-    virtual bool open()  = 0;
+    virtual ~IUsbDevice() = default;
-    virtual void close() = 0;
+    virtual bool open()   = 0;
+    virtual void close()  = 0;
 
     // libusb wrappers
     virtual bool detachKernelDriver(int interfaceNo) = 0;

src/libusbwrap/interface/IUsbDeviceFactory.hpp

@@ -9,7 +9,8 @@
 namespace libusbwrap {
 class IUsbDeviceFactory {
    public:
-    virtual std::vector<std::shared_ptr<IUsbDevice>> findAllDevices()                        = 0;
+    virtual ~IUsbDeviceFactory()                                      = default;
+    virtual std::vector<std::shared_ptr<IUsbDevice>> findAllDevices() = 0;
     virtual std::vector<std::shared_ptr<IUsbDevice>> findDevices(uint16_t vid, uint16_t pid) = 0;
 };
 }  // namespace libusbwrap

src/main.cpp

@@ -1,18 +1,28 @@
-#include <spdlog/spdlog.h>
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
 #include "PtouchPrint.hpp"
 
-void setupLogger() {
-    spdlog::set_level(spdlog::level::debug);
-    spdlog::info("Starting ptprnt {}", PROJ_VERSION);
-}
-
 int main(int argc, char** argv) {
-    setupLogger();
+    ptprnt::PtouchPrint ptouchprnt(PROJ_VERSION);
-
+    int ret = ptouchprnt.init(argc, argv);
-    PtouchPrint ptouchprnt;
+    if (ret != 0) {
-    ptouchprnt.init();
+        return ret;
-    ptouchprnt.run();
+    }
-
+    return ptouchprnt.run();
-    return 0;
 }

src/meson.build

@@ -0,0 +1,24 @@
+ptprnt_hpps = files (
+    'libusbwrap/interface/IUsbDeviceFactory.hpp',
+    'libusbwrap/interface/IUsbDevice.hpp',
+    'libusbwrap/UsbDeviceFactory.hpp',
+    'libusbwrap/LibUsbTypes.hpp',
+    'libusbwrap/UsbDevice.hpp',
+    'interface/IPrinterDriver.hpp',
+    'interface/IPrinterTypes.hpp',
+    'P700Printer.hpp',
+    'PtouchPrint.hpp',
+    'graphics/Bitmap.hpp',
+    'graphics/Image.hpp',
+    'graphics/Monochrome.hpp'
+)
+
+ptprnt_srcs = files (
+    'PtouchPrint.cpp',
+    'P700Printer.cpp',
+    'graphics/Image.cpp',
+    'graphics/Bitmap.cpp',
+    'graphics/Monochrome.cpp',
+    'libusbwrap/UsbDeviceFactory.cpp',
+    'libusbwrap/UsbDevice.cpp',
+)

subprojects/cli11.wrap

@@ -0,0 +1,9 @@
+[wrap-file]
+directory = CLI11-2.3.2
+source_url = https://github.com/CLIUtils/CLI11/archive/refs/tags/v2.3.2.tar.gz
+source_filename = CLI11-2.3.2.tar.gz
+source_hash = aac0ab42108131ac5d3344a9db0fdf25c4db652296641955720a4fbe52334e22
+wrapdb_version = 2.3.2-1
+
+[provide]
+cli11 = CLI11_dep

tests/bitmap_test/bitmap_test.cpp

@@ -1,8 +1,29 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "graphics/Bitmap.hpp"
 
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <optional>
+#include <vector>
 
 TEST(basic_test, Bitmap_createBitmapWithCertainSize_yieldsSpecifiedSize) {
     auto bm     = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(16, 8);
@@ -29,19 +50,52 @@ TEST(basic_test, Bitmap_getBitmapLineInsideOfImage_yieldsValidLineSize) {
     ASSERT_EQ(16, lineSize);
 }
 
-TEST(basic_test, Bitmap_getBitmapRowOutsideOfImage_yieldsNullopt) {
+TEST(basic_test, Bitmap_getBitmapColOutsideOfImage_yieldsNullopt) {
     auto bm = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(16, 8);
-    // row 16 is out of bounds, count begins with 0
+    // col 16 is out of bounds, count begins with 0
-    auto outOfBoundsRow = bm.getRow(16);
+    auto outOfBoundsCol = bm.getCol(16);
-    ASSERT_EQ(std::nullopt, outOfBoundsRow);
+    ASSERT_EQ(std::nullopt, outOfBoundsCol);
 }
 
-TEST(basic_test, Bitmap_getBitmapRowInsideOfImage_yieldsValidRowSize) {
+TEST(basic_test, Bitmap_getBitmapColInsideOfImage_yieldsValidColSize) {
     auto bm  = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(16, 8);
-    auto row = bm.getRow(15);
+    auto col = bm.getCol(15);
-    if (!row) {
+    if (!col) {
-        FAIL() << "Returned Row is invalid";
+        FAIL() << "Returned Col is invalid";
     }
-    auto rowSize = row->size();
+    auto colSize = col->size();
-    ASSERT_EQ(8, rowSize);
+    ASSERT_EQ(8, colSize);
+}
+
+TEST(basic_test, Bitmap_setPixels_setsGivenPixels) {
+    auto bm = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(16, 8);
+    std::vector<uint8_t> pix(16 * 8);
+
+    bm.setPixels(pix);
+    auto pixCpy = bm.getPixelsCpy();
+
+    ASSERT_EQ(pix, pixCpy);
+}
+
+TEST(basic_test, Bitmap_setPixels_isSuccessfulWithValidPixels) {
+    auto bm = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(16, 8);
+    std::vector<uint8_t> pix(16 * 8);
+
+    ASSERT_TRUE(bm.setPixels(pix));
+}
+
+TEST(basic_test, Bitmap_setPixels_yieldsSamePixelsBack) {
+    auto bm = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(16, 8);
+    std::vector<uint8_t> pix(16 * 8);
+
+    bm.setPixels(pix);
+    auto pixCpy = bm.getPixelsCpy();
+    ASSERT_EQ(pix, pixCpy);
+}
+
+TEST(basic_test, Bitmap_setPixelsWithWrongSize_isFailing) {
+    auto bm = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(5, 8);
+    std::vector<uint8_t> pix(16 * 8);
+
+    ASSERT_FALSE(bm.setPixels(pix));
 }

tests/image_test/image_test.cpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "graphics/Image.hpp"
 
 #include <gtest/gtest.h>

tests/meson.build

@@ -1,6 +1,6 @@
-tests = [['bitmap_test', 'bitmap_test_exe', ['bitmap_test/bitmap_test.cpp']],
+tests = [['bitmap_test', 'bitmap_test_exe', ptprnt_srcs + ['bitmap_test/bitmap_test.cpp']],
-         ['image_test', 'image_test_exe', ['image_test/image_test.cpp']],
+         ['image_test', 'image_test_exe', ptprnt_srcs +['image_test/image_test.cpp']],
-         ['monochrome_test', 'monochrome_test_exe', ['monochrome_test/monochrome_test.cpp']]
+         ['monochrome_test', 'monochrome_test_exe', ptprnt_srcs +['monochrome_test/monochrome_test.cpp']]
         ]
 
 foreach test : tests
@@ -8,8 +8,7 @@ foreach test : tests
          executable(test.get(1),
                     sources: test.get(2),
                     include_directories: incdir,
-                    link_with:[ptprnt_lib],
+                    dependencies: [gtest_dep, usb_dep, log_dep, pangocairo_dep, cli11_dep]
-                    dependencies: [gtest_dep, pangocairo_dep]
          )
     )
 endforeach

tests/monochrome_test/monochrome_test.cpp

@@ -1,3 +1,22 @@
+/* 
+    ptrnt - print labels on linux
+    Copyright (C) 2023  Moritz Martinius
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ */
+
 #include "graphics/Monochrome.hpp"
 
 #include <gtest/gtest.h>