diff --git a/.gitignore b/.gitignore
index c12ee3d..b932550 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,34 @@
-# This file is used to ignore files which are generated
-# ----------------------------------------------------------------------------
-
-*~
-*.autosave
-
-*.moc
-*.o
-*.obj
-*.orig
-*.rej
-
-
-*.debug
-Makefile?*
-*.prl
-*.app
-moc_*.cpp
-
-/.qmake.cache
-/.qmake.stash
-
-# qtcreator generated files
-*.pro.user*
-
-# MinGW generated files
-*.Debug
-*.Release
-
-
-#Own adds:
-build*
-Makefile
-S_New4
+# This file is used to ignore files which are generated
+# ----------------------------------------------------------------------------
+
+*~
+*.autosave
+
+*.moc
+*.o
+*.obj
+*.orig
+*.rej
+
+
+*.debug
+Makefile?*
+*.prl
+*.app
+moc_*.cpp
+
+/.qmake.cache
+/.qmake.stash
+
+# qtcreator generated files
+*.pro.user*
+
+# MinGW generated files
+*.Debug
+*.Release
+
+
+#Own adds:
+build*
+Makefile
+S_New4
diff --git a/Changelog.md b/Changelog.md
index 44ca3dd..cb84ddc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,149 +1,149 @@
-## Changelog
-
-### v.5.1.1
-* Update Curl Lib & WinLib handling
-
-### v.5.1.0
-* Add update Warning
-
-### v.5.0.0
-* Multi Page support!
-
-### v.4.3.0
-* Second Download url, if first doesn't work anymore
-
-### v.4.2.0
-* New Update Url.... manuel update needed
-
-### v.4.1.0
-* Change s.to -> serienstream.sx
-
-### v.4.0.4
-* Fix Error: Konnte Position von script async= nicht finden
-
-### v.4.0.2/3
-* Entferne /embed bei Vivo und ignoriere Groß-& Kleinschreib. Bei -l & -g
-
-### v.4.0.1
-* Behebe falsche Position von der 0 bei der Zeit im LogFile
-
-### v.4.0.0
-* Füge Architekture ARM v6 hinzu
-
-### v.3.9.1/2/3
-* Behebe Fehler bei der Replace Funktion + Farben bei der LogFile ausgabe
-
-### v.3.9.0
-* Neu: Möglichkeit, mehrere Dateien mit -o anzugeben
-* Im DefaultFile: Schreibe nun, wenn nicht verändert mit -o Ausgabe ins LogFile
-
-### v.3.8.0
-* Log System
-
-### v.3.6.3 -> 3.8
-* SIEHE IN GIT COMMITS
-
-### v3.6.2
-* Füge ChangeLog Datei hinzu
-
-### v3.6.1
-* Extra ausgabe bei ungültigen Redirect Links, vorallem bei Unterfunktion url
-* Verschiebe Source Dateien in den Order src/
-
-### v3.6.0
-* Deaktivireung des Proxy mit Port 0 nun möglich
-
-### v3.5.6
-* Bei Haupt Helpmenüe kann man nun -- weglassen bei --help
-
-### v3.5.5
-* Stoppe nun sofort, wenn checkName Function durch fehlerhaften HTML code fehlschlägt
-
-### v3.5.4
-* Größere Fehlerbehebungen
-
-### v3.5.3
-* Bei Serienauswahl wird nun auch der 2.te Name falls vorhanden angezeigt ( bei 1ner Möglichkeiten (1 Serien gefunden) )
-
-### v3.5.2
-* Bei Serienauswahl wird nun auch der 2.te Name falls vorhanden angezeigt ( bei mehren Möglichkeiten (verschiedenen Serien) )
-
-### v3.5.1
-* Serienliste: Seriensortierung: Genres -> Alphabet
-
-### v3.5.0
-* Neuer Parameter: -s bei der Unterfunktion info um Namenausgabe der einzelnen Folgen zu verhindern
-
-### v3.4.6
-* Behebe Fehler bei Serien mit HTML Sonderzeichen im Namen in der Serienliste
-
-### v3.4.5
-* Füge Farbausgabe bei der Unterfuktion info hinzu
-
-### v3.4.4
-* Erseze HTML Sonderzeichen mit Asci Zeichen in info Unterfunktion
-* Verbessere Ausgabe bei der Unterfunktion info
-
-### v3.4.3
-* Behbe bei manchen Function: In Windows Pfadzeichen / -> \
-* Behebe Fehler in Suchfunktion bei Serien mit einem / im Namen
-
-### v3.4.2
-* Füge Fehlernachricht bei --remove hinzu, wenn kein Ordner ausgewählt wurde
-
-### v3.4.1
-* Größere Fehlerbehebungen
-* Füge Unterfunktion --remove dem Helpmenü hinzu
-
-### v3.4.0
-* Neue Unterfunktion: --remove
-
-### v3.3.2
-* Entferne vor kurzem hinzugefügtes überprüfen nach HTML Fehlern beim herunterladen der Internetseiten
-
-### v3.3.1
-* Verbesserung der Überprüfung der Versionen beim Updaten
-
-### v3.3.0
-* Überarbeitung der Unterfunkion --update
-
-### v3.2.0
-* Füge Update hinzu: Vorsicht fehlerhaft -> v3.2.0
-* Füge Function zum Downloaden in Dateien
-* Update Readme
-
-### v3.1.1
-* Behebe Pfade im Helpmenü
-* Update Readme
-* füge Windows Libraries hinzu
-
-### v3.1.0
-* Mann kan nun bei Ungültiger Serie 1ne Serie aus mehreren Möglichkeiten auswählen, falls vorhanden
-
-### v3.0.6 / v3.0.5
-* Behebe Überschreibung des Namens in der Serienauswahlfunktion
-* Debug Nachrichten & Besseres Aussehen der Debug nachrichten
-* Behebe Fehler: Programm stoppt wenn Staffel beendet ist, wartet aber nicht auf die Threads
-
-### v3.0.4
-* Behebe Fehler beim 1. mal Updaten der Serienliste, wenn die Datei noch nicht existiert
-
-### v3.0.3
-* Behebe Helpmenü fehler
-* Füge Hoster * hinzu, aber nur mit Trick möglich, da dieser Vorgang unnötig viele Accounts braucht
-
-### v3.0.2
-* Aktualisiere Unterfuktion search's Helpmenü
-* Aktualisiere Defaults-Datei (neue Bezeichnungen)
-
-### v3.0.1
-* Größere Fehlerbehebungen
-* Nun möglich: Updaten der serienliste und Namesuche
-
-### v3.0.0
-* Füge Updatewarnsystem bei Serienliste hinzu
-
-### Vorher
-* -
-
-
+## Changelog
+
+### v.5.1.1
+* Update Curl Lib & WinLib handling
+
+### v.5.1.0
+* Add update Warning
+
+### v.5.0.0
+* Multi Page support!
+
+### v.4.3.0
+* Second Download url, if first doesn't work anymore
+
+### v.4.2.0
+* New Update Url.... manuel update needed
+
+### v.4.1.0
+* Change s.to -> serienstream.sx
+
+### v.4.0.4
+* Fix Error: Konnte Position von script async= nicht finden
+
+### v.4.0.2/3
+* Entferne /embed bei Vivo und ignoriere Groß-& Kleinschreib. Bei -l & -g
+
+### v.4.0.1
+* Behebe falsche Position von der 0 bei der Zeit im LogFile
+
+### v.4.0.0
+* Füge Architekture ARM v6 hinzu
+
+### v.3.9.1/2/3
+* Behebe Fehler bei der Replace Funktion + Farben bei der LogFile ausgabe
+
+### v.3.9.0
+* Neu: Möglichkeit, mehrere Dateien mit -o anzugeben
+* Im DefaultFile: Schreibe nun, wenn nicht verändert mit -o Ausgabe ins LogFile
+
+### v.3.8.0
+* Log System
+
+### v.3.6.3 -> 3.8
+* SIEHE IN GIT COMMITS
+
+### v3.6.2
+* Füge ChangeLog Datei hinzu
+
+### v3.6.1
+* Extra ausgabe bei ungültigen Redirect Links, vorallem bei Unterfunktion url
+* Verschiebe Source Dateien in den Order src/
+
+### v3.6.0
+* Deaktivireung des Proxy mit Port 0 nun möglich
+
+### v3.5.6
+* Bei Haupt Helpmenüe kann man nun -- weglassen bei --help
+
+### v3.5.5
+* Stoppe nun sofort, wenn checkName Function durch fehlerhaften HTML code fehlschlägt
+
+### v3.5.4
+* Größere Fehlerbehebungen
+
+### v3.5.3
+* Bei Serienauswahl wird nun auch der 2.te Name falls vorhanden angezeigt ( bei 1ner Möglichkeiten (1 Serien gefunden) )
+
+### v3.5.2
+* Bei Serienauswahl wird nun auch der 2.te Name falls vorhanden angezeigt ( bei mehren Möglichkeiten (verschiedenen Serien) )
+
+### v3.5.1
+* Serienliste: Seriensortierung: Genres -> Alphabet
+
+### v3.5.0
+* Neuer Parameter: -s bei der Unterfunktion info um Namenausgabe der einzelnen Folgen zu verhindern
+
+### v3.4.6
+* Behebe Fehler bei Serien mit HTML Sonderzeichen im Namen in der Serienliste
+
+### v3.4.5
+* Füge Farbausgabe bei der Unterfuktion info hinzu
+
+### v3.4.4
+* Erseze HTML Sonderzeichen mit Asci Zeichen in info Unterfunktion
+* Verbessere Ausgabe bei der Unterfunktion info
+
+### v3.4.3
+* Behbe bei manchen Function: In Windows Pfadzeichen / -> \
+* Behebe Fehler in Suchfunktion bei Serien mit einem / im Namen
+
+### v3.4.2
+* Füge Fehlernachricht bei --remove hinzu, wenn kein Ordner ausgewählt wurde
+
+### v3.4.1
+* Größere Fehlerbehebungen
+* Füge Unterfunktion --remove dem Helpmenü hinzu
+
+### v3.4.0
+* Neue Unterfunktion: --remove
+
+### v3.3.2
+* Entferne vor kurzem hinzugefügtes überprüfen nach HTML Fehlern beim herunterladen der Internetseiten
+
+### v3.3.1
+* Verbesserung der Überprüfung der Versionen beim Updaten
+
+### v3.3.0
+* Überarbeitung der Unterfunkion --update
+
+### v3.2.0
+* Füge Update hinzu: Vorsicht fehlerhaft -> v3.2.0
+* Füge Function zum Downloaden in Dateien
+* Update Readme
+
+### v3.1.1
+* Behebe Pfade im Helpmenü
+* Update Readme
+* füge Windows Libraries hinzu
+
+### v3.1.0
+* Mann kan nun bei Ungültiger Serie 1ne Serie aus mehreren Möglichkeiten auswählen, falls vorhanden
+
+### v3.0.6 / v3.0.5
+* Behebe Überschreibung des Namens in der Serienauswahlfunktion
+* Debug Nachrichten & Besseres Aussehen der Debug nachrichten
+* Behebe Fehler: Programm stoppt wenn Staffel beendet ist, wartet aber nicht auf die Threads
+
+### v3.0.4
+* Behebe Fehler beim 1. mal Updaten der Serienliste, wenn die Datei noch nicht existiert
+
+### v3.0.3
+* Behebe Helpmenü fehler
+* Füge Hoster * hinzu, aber nur mit Trick möglich, da dieser Vorgang unnötig viele Accounts braucht
+
+### v3.0.2
+* Aktualisiere Unterfuktion search's Helpmenü
+* Aktualisiere Defaults-Datei (neue Bezeichnungen)
+
+### v3.0.1
+* Größere Fehlerbehebungen
+* Nun möglich: Updaten der serienliste und Namesuche
+
+### v3.0.0
+* Füge Updatewarnsystem bei Serienliste hinzu
+
+### Vorher
+* -
+
+
diff --git a/LICENSE b/LICENSE
index 9a4eebc..3c644c8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,674 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- 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) 2018 6543@obermui.de
-
- 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 .
-
-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:
-
- remaster Copyright (C) 2018 6543@obermui.de
- 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
-.
-
- 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
-.
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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) 2018 6543@obermui.de
+
+ 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 .
+
+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:
+
+ remaster Copyright (C) 2018 6543@obermui.de
+ 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
+.
+
+ 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
+.
diff --git a/README.md b/README.md
index 6d45f63..ea84d28 100644
--- a/README.md
+++ b/README.md
@@ -1,80 +1,80 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-
-
-# S_New4
-
-Aufruf: S_New4 [Unteroption] [PARAMETER]...
-
-### Beschreibung:
- -> Mit diesem Programm kann man die Download-Urls
- oder Informationen von Serien bekommen.
- -> Mit diesem Programm kann man Redirect-Links von
- s.to umwandeln.
-
-### Unteroptionen:
- "--help" Gibt dieses Helpmenue aus.
- "--version" Gibt die Version des Programmes aus.
- "--update" Modus um das Programm zu aktualisieren.
- Updater funktioniert nur bei: Windows/Linux -
- x86 Architekutur - 64 Bit Systemen und Arm6 32 Bit.
- "--remove" Modus um Ordner mit Einstellungen/
- Zwischengespeicherte-Dateien zu löschen.
- "url" Modus um eigene Redirect-Links umzuwandeln.
- "default" Modus um Links von Serien zu bekommen.
- "search" Modus um Serien zu suchen.
- "info" Modus um Infos einer Serien zu bekommen.
- "clean" Modus um Cookie-Files zu löschen.
- "news" Modus um neusten 75 Folgen auf s.to zu sehen.
- "log" Modus um Log Datei zu sehen / leeren.
-
-### Verzeichnisse:
- Ordner zum zwischenspeichern der Cookies und der AccountNummer:
- > '/home/*/.cache/S_New4/' - Linux
- > '%LocalAppData%/S_New4' - Windows
- Ordner zum speichern der Accounts und Default-Einstellungen:
- > '/home/*/.config/S_New4/' - Linux
- > '%AppData%/S_New4' - Windows
-
-
-## Updater Funktion:
-##### S_New4 hat einen Updater der für folgende Systeme funktioniert:
-##### * Windows, 64 Bit Programm ( Die neue Version ist immer 64 Bit ), x86 Architektur
-##### * Linux, 64 Bit Programm ( Die neue Version ist immer 64 Bit ), x86 Architektur
-##### * Linux, 32 Bit Programm ( Die neue Version ist immer 32 Bit ), ARM v6
-
-
-
-
-# Compalieren
-
-
-### Linux:
-
-##### Abhängigkeiten:
-
-```sh
- sudo apt install libcurl4-openssl-dev
-```
-
-#### g++
-```sh
- g++ --std=c++14 accountManager.cpp accountManager.h main.cpp pageManager.cpp pageManager.h parameterManager.cpp parameterManager.h programManager.cpp programManager.h logger.h logger.cpp -lcurl -lpthread -o S_New4
-```
-
-#### QT-Style:
-```sh
- qmake && make
-```
-
-### Windows: (nur x86_64 Architekture, wenn beigefügte Libraries verwendet werden möchten)
-
-##### Abhängigkeiten:
-
-Empfohlen: Verwende S_New4 mit einem Unicode Compatiblem Terminal: Zum Beispiel mit dem
- Git Bash Terminal
-
-#### QT-Style: ( MinGW-64Bit )
-
-Nutze den QT-Creator:
- > In dem Unterordner curl/ befinden sich die benötigten Header- und Curl-Lib-Dateien für curl
- > C++ und Winpthread Libs befinden sich in dem Ordner x86_64-WIN_LIBS/
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+
+
+# S_New4
+
+Aufruf: S_New4 [Unteroption] [PARAMETER]...
+
+### Beschreibung:
+ -> Mit diesem Programm kann man die Download-Urls
+ oder Informationen von Serien bekommen.
+ -> Mit diesem Programm kann man Redirect-Links von
+ s.to umwandeln.
+
+### Unteroptionen:
+ "--help" Gibt dieses Helpmenue aus.
+ "--version" Gibt die Version des Programmes aus.
+ "--update" Modus um das Programm zu aktualisieren.
+ Updater funktioniert nur bei: Windows/Linux -
+ x86 Architekutur - 64 Bit Systemen und Arm6 32 Bit.
+ "--remove" Modus um Ordner mit Einstellungen/
+ Zwischengespeicherte-Dateien zu löschen.
+ "url" Modus um eigene Redirect-Links umzuwandeln.
+ "default" Modus um Links von Serien zu bekommen.
+ "search" Modus um Serien zu suchen.
+ "info" Modus um Infos einer Serien zu bekommen.
+ "clean" Modus um Cookie-Files zu löschen.
+ "news" Modus um neusten 75 Folgen auf s.to zu sehen.
+ "log" Modus um Log Datei zu sehen / leeren.
+
+### Verzeichnisse:
+ Ordner zum zwischenspeichern der Cookies und der AccountNummer:
+ > '/home/*/.cache/S_New4/' - Linux
+ > '%LocalAppData%/S_New4' - Windows
+ Ordner zum speichern der Accounts und Default-Einstellungen:
+ > '/home/*/.config/S_New4/' - Linux
+ > '%AppData%/S_New4' - Windows
+
+
+## Updater Funktion:
+##### S_New4 hat einen Updater der für folgende Systeme funktioniert:
+##### * Windows, 64 Bit Programm ( Die neue Version ist immer 64 Bit ), x86 Architektur
+##### * Linux, 64 Bit Programm ( Die neue Version ist immer 64 Bit ), x86 Architektur
+##### * Linux, 32 Bit Programm ( Die neue Version ist immer 32 Bit ), ARM v6
+
+
+
+
+# Compalieren
+
+
+### Linux:
+
+##### Abhängigkeiten:
+
+```sh
+ sudo apt install libcurl4-openssl-dev
+```
+
+#### g++
+```sh
+ g++ --std=c++14 accountManager.cpp accountManager.h main.cpp pageManager.cpp pageManager.h parameterManager.cpp parameterManager.h programManager.cpp programManager.h logger.h logger.cpp -lcurl -lpthread -o S_New4
+```
+
+#### QT-Style:
+```sh
+ qmake && make
+```
+
+### Windows: (nur x86_64 Architekture, wenn beigefügte Libraries verwendet werden möchten)
+
+##### Abhängigkeiten:
+
+Empfohlen: Verwende S_New4 mit einem Unicode Compatiblem Terminal: Zum Beispiel mit dem
+ Git Bash Terminal
+
+#### QT-Style: ( MinGW-64Bit )
+
+Nutze den QT-Creator:
+ > In dem Unterordner curl/ befinden sich die benötigten Header- und Curl-Lib-Dateien für curl
+ > C++ und Winpthread Libs befinden sich in dem Ordner x86_64-WIN_LIBS/
diff --git a/alt/g++/.gitignore b/alt/g++/.gitignore
index 7b02e68..a38af0a 100644
--- a/alt/g++/.gitignore
+++ b/alt/g++/.gitignore
@@ -1,76 +1,76 @@
-# This file is used to ignore files which are generated
-# ----------------------------------------------------------------------------
-
-*~
-*.autosave
-*.a
-*.core
-*.moc
-*.o
-*.obj
-*.orig
-*.rej
-*.so
-*.so.*
-*_pch.h.cpp
-*_resource.rc
-*.qm
-.#*
-*.*#
-core
-!core/
-tags
-.DS_Store
-.directory
-*.debug
-Makefile*
-*.prl
-*.app
-moc_*.cpp
-ui_*.h
-qrc_*.cpp
-Thumbs.db
-*.res
-*.rc
-/.qmake.cache
-/.qmake.stash
-
-# qtcreator generated files
-*.pro.user*
-
-# xemacs temporary files
-*.flc
-
-# Vim temporary files
-.*.swp
-
-# Visual Studio generated files
-*.ib_pdb_index
-*.idb
-*.ilk
-*.pdb
-*.sln
-*.suo
-*.vcproj
-*vcproj.*.*.user
-*.ncb
-*.sdf
-*.opensdf
-*.vcxproj
-*vcxproj.*
-
-# MinGW generated files
-*.Debug
-*.Release
-
-# Python byte code
-*.pyc
-
-# Binaries
-# --------
-*.dll
-*.exe
-
-#Own adds:
-g++/*
-
+# This file is used to ignore files which are generated
+# ----------------------------------------------------------------------------
+
+*~
+*.autosave
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.rej
+*.so
+*.so.*
+*_pch.h.cpp
+*_resource.rc
+*.qm
+.#*
+*.*#
+core
+!core/
+tags
+.DS_Store
+.directory
+*.debug
+Makefile*
+*.prl
+*.app
+moc_*.cpp
+ui_*.h
+qrc_*.cpp
+Thumbs.db
+*.res
+*.rc
+/.qmake.cache
+/.qmake.stash
+
+# qtcreator generated files
+*.pro.user*
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.sdf
+*.opensdf
+*.vcxproj
+*vcxproj.*
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# Python byte code
+*.pyc
+
+# Binaries
+# --------
+*.dll
+*.exe
+
+#Own adds:
+g++/*
+
diff --git a/alt/g++/make32Bit.sh b/alt/g++/make32Bit.sh
index 3f18a24..9fbfca1 100755
--- a/alt/g++/make32Bit.sh
+++ b/alt/g++/make32Bit.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
-
-i686-w64-mingw32-g++ ./*.h ./*.cpp -o S_New4_x32.exe -DCURL_STATICLIB -static-libgcc -static-libstdc++ -lpthread -lcurl -lwldap32 -lws2_32 -std=c++11
-sleep 3
+#!/bin/bash
+
+i686-w64-mingw32-g++ ./*.h ./*.cpp -o S_New4_x32.exe -DCURL_STATICLIB -static-libgcc -static-libstdc++ -lpthread -lcurl -lwldap32 -lws2_32 -std=c++11
+sleep 3
diff --git a/alt/g++/make64Bit.sh b/alt/g++/make64Bit.sh
index 4d99f18..18564e7 100755
--- a/alt/g++/make64Bit.sh
+++ b/alt/g++/make64Bit.sh
@@ -1,6 +1,6 @@
-#!/bin/bash
-
-#x86_64-w64-mingw32-g++ ./*.h ./*.cpp -o S_New4_x64.exe -DCURL_STATICLIB -static-libgcc -static-libstdc++ -lpthread -lcurl -lwldap32 -lws2_32 -std=c++11
-x86_64-w64-mingw32-g++ ./*.h ./*.cpp -o S_New4_x64.exe -static-libgcc -static-libstdc++ -lpthread -lcurl -lws2_32 -std=c++11
-sleep 3
-
+#!/bin/bash
+
+#x86_64-w64-mingw32-g++ ./*.h ./*.cpp -o S_New4_x64.exe -DCURL_STATICLIB -static-libgcc -static-libstdc++ -lpthread -lcurl -lwldap32 -lws2_32 -std=c++11
+x86_64-w64-mingw32-g++ ./*.h ./*.cpp -o S_New4_x64.exe -static-libgcc -static-libstdc++ -lpthread -lcurl -lws2_32 -std=c++11
+sleep 3
+
diff --git a/src/.qmake.stash b/src/.qmake.stash
index cb4ebf0..6f58073 100644
--- a/src/.qmake.stash
+++ b/src/.qmake.stash
@@ -1,19 +1,19 @@
-QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
-QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 5
-QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 5
-QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
-QMAKE_CXX.COMPILER_MACROS = \
- QT_COMPILER_STDCXX \
- QMAKE_GCC_MAJOR_VERSION \
- QMAKE_GCC_MINOR_VERSION \
- QMAKE_GCC_PATCH_VERSION
-QMAKE_CXX.INCDIRS = \
- /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include/c++ \
- /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include/c++/x86_64-w64-mingw32.static \
- /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include/c++/backward \
- /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include \
- /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include-fixed \
- /home/markus/git/mxe/usr/x86_64-w64-mingw32.static/include
-QMAKE_CXX.LIBDIRS = \
- /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0 \
- /home/markus/git/mxe/usr/x86_64-w64-mingw32.static/lib
+QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 5
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 5
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
+QMAKE_CXX.COMPILER_MACROS = \
+ QT_COMPILER_STDCXX \
+ QMAKE_GCC_MAJOR_VERSION \
+ QMAKE_GCC_MINOR_VERSION \
+ QMAKE_GCC_PATCH_VERSION
+QMAKE_CXX.INCDIRS = \
+ /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include/c++ \
+ /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include/c++/x86_64-w64-mingw32.static \
+ /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include/c++/backward \
+ /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include \
+ /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0/include-fixed \
+ /home/markus/git/mxe/usr/x86_64-w64-mingw32.static/include
+QMAKE_CXX.LIBDIRS = \
+ /home/markus/git/mxe/usr/lib/gcc/x86_64-w64-mingw32.static/5.5.0 \
+ /home/markus/git/mxe/usr/x86_64-w64-mingw32.static/lib
diff --git a/src/S_New4.pro b/src/S_New4.pro
index 827b427..1ab4c03 100644
--- a/src/S_New4.pro
+++ b/src/S_New4.pro
@@ -1,44 +1,44 @@
-QT -= gui
-#CONFIG += -static -libstdc++ -static-libgcc #-static
-
-#Linux:
-unix: LIBS += -lcurl
-
-#Windows
-win32: LIBS += -L$${_PRO_FILE_PWD_}\..\lib\ -lcurl # 7.82.0
-#win32: LIBS += -L$${_PRO_FILE_PWD_}\..\alt\ -lcurl # 7.64.1
-
-
-CONFIG += c++17 console
-CONFIG -= app_bundle
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
- main.cpp \
- pageManager.cpp \
- parameterManager.cpp \
- programManager.cpp \
- accountManager.cpp \
- logger.cpp
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-HEADERS += \
- pageManager.h \
- parameterManager.h \
- programManager.h \
- accountManager.h \
- logger.h
+QT -= gui
+#CONFIG += -static -libstdc++ -static-libgcc #-static
+
+#Linux:
+unix: LIBS += -lcurl
+
+#Windows
+win32: LIBS += -L$${_PRO_FILE_PWD_}\..\lib\ -lcurl # 7.82.0
+#win32: LIBS += -L$${_PRO_FILE_PWD_}\..\alt\ -lcurl # 7.64.1
+
+
+CONFIG += c++17 console
+CONFIG -= app_bundle
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += \
+ main.cpp \
+ pageManager.cpp \
+ parameterManager.cpp \
+ programManager.cpp \
+ accountManager.cpp \
+ logger.cpp
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
+
+HEADERS += \
+ pageManager.h \
+ parameterManager.h \
+ programManager.h \
+ accountManager.h \
+ logger.h
diff --git a/src/accountManager.cpp b/src/accountManager.cpp
index 41ff687..92d638a 100644
--- a/src/accountManager.cpp
+++ b/src/accountManager.cpp
@@ -1,275 +1,275 @@
-#include "accountManager.h"
-
-AccountManager::AccountManager(std::string pathToFil, std::string pathToAccountNumberFile, PAGE page, const PAGE *pagesALL)
- : pagesALL(pagesALL), pathToAccountNumberFile(pathToAccountNumberFile + "_" + page.name_id), pageInUse(page)
-{
- std::string pathToAccountsFile = pathToFil + "_" + page.name_id;
- std::ifstream ifs(pathToAccountsFile);
- if(!ifs.is_open()) {
- if(writeDefault(pathToAccountsFile) != 0)
- exit(12);
- ifs.open(pathToAccountsFile);
- if(!ifs.is_open()) {
- std::cout << " => Error: Konnte Account File nicht aufmachen" << std::endl;
- exit(13);
- }
- }
-
-
- std::string line;
- while (std::getline(ifs, line)) {
- if(line.length() > 0 && line[0] == '#')
- continue;
- Account account;
- size_t Delimeter = line.find("/");
-
- if(Delimeter == std::string::npos) {
- account.Email = line;
- account.Password = line;
- } else {
- account.Email = std::string(line).erase(Delimeter, line.length() - Delimeter);
- account.Password = line.erase(0, Delimeter + 1);
- }
- if(account.Email == "" || account.Password == "")
- continue;
- else
- accounts.push_back(account);
- }
-
- ifs.close();
-
-}
-
-Account AccountManager::getNextAccount()
-{
- if(accounts.size() == 0) {
- std::cout << " => Error: Keine Accounts vorhanden." << std::endl;
- exit(36);
- }
- size_t accountNumber = getLastAccountNumber();
- ++accountNumber;
-
- if( accountNumber >= accounts.size() )
- accountNumber=0;
- if(setLastAccountNumber(accountNumber) != 0)
- exit(45);
-
- return accounts.at(accountNumber);
-}
-
-int AccountManager::writeDefault(std::string path)
-{
- std::ofstream ofs(path);
- if(!ofs.is_open()) {
- perror((std::string(" => Error: Konnte Account Datei nicht aufmachen: ") + path).c_str());
- return -1;
- }
- std::cout << " => Erstelle Datei mit Accounts unter: " << path << "..." < WARNUNG: Keine standart Accounts für die Url '" << pageInUse.url << "' vorhanden." < Error: Konnte Account Number Datei nicht erstellen");
- exit(34);
- }
- }
-
- std::string content( (std::istreambuf_iterator(fStream) ), (std::istreambuf_iterator() ) );
- return static_cast( atoi(content.c_str()) );
-}
-
-int AccountManager::setLastAccountNumber(size_t number)
-{
- std::ofstream ofs;
- ofs.open(pathToAccountNumberFile, std::ios::trunc);
- if(!ofs.is_open()) {
- std::cout << " => Error: Account Number Datei ist nicht aufgemacht." << std::endl;
- return 110;
- }
- //fStream.clear();
- ofs << number << std::endl;
- return 0;
-}
-
+#include "accountManager.h"
+
+AccountManager::AccountManager(std::string pathToFil, std::string pathToAccountNumberFile, PAGE page, const PAGE *pagesALL)
+ : pagesALL(pagesALL), pathToAccountNumberFile(pathToAccountNumberFile + "_" + page.name_id), pageInUse(page)
+{
+ std::string pathToAccountsFile = pathToFil + "_" + page.name_id;
+ std::ifstream ifs(pathToAccountsFile);
+ if(!ifs.is_open()) {
+ if(writeDefault(pathToAccountsFile) != 0)
+ exit(12);
+ ifs.open(pathToAccountsFile);
+ if(!ifs.is_open()) {
+ std::cout << " => Error: Konnte Account File nicht aufmachen" << std::endl;
+ exit(13);
+ }
+ }
+
+
+ std::string line;
+ while (std::getline(ifs, line)) {
+ if(line.length() > 0 && line[0] == '#')
+ continue;
+ Account account;
+ size_t Delimeter = line.find("/");
+
+ if(Delimeter == std::string::npos) {
+ account.Email = line;
+ account.Password = line;
+ } else {
+ account.Email = std::string(line).erase(Delimeter, line.length() - Delimeter);
+ account.Password = line.erase(0, Delimeter + 1);
+ }
+ if(account.Email == "" || account.Password == "")
+ continue;
+ else
+ accounts.push_back(account);
+ }
+
+ ifs.close();
+
+}
+
+Account AccountManager::getNextAccount()
+{
+ if(accounts.size() == 0) {
+ std::cout << " => Error: Keine Accounts vorhanden." << std::endl;
+ exit(36);
+ }
+ size_t accountNumber = getLastAccountNumber();
+ ++accountNumber;
+
+ if( accountNumber >= accounts.size() )
+ accountNumber=0;
+ if(setLastAccountNumber(accountNumber) != 0)
+ exit(45);
+
+ return accounts.at(accountNumber);
+}
+
+int AccountManager::writeDefault(std::string path)
+{
+ std::ofstream ofs(path);
+ if(!ofs.is_open()) {
+ perror((std::string(" => Error: Konnte Account Datei nicht aufmachen: ") + path).c_str());
+ return -1;
+ }
+ std::cout << " => Erstelle Datei mit Accounts unter: " << path << "..." < WARNUNG: Keine standart Accounts für die Url '" << pageInUse.url << "' vorhanden." < Error: Konnte Account Number Datei nicht erstellen");
+ exit(34);
+ }
+ }
+
+ std::string content( (std::istreambuf_iterator(fStream) ), (std::istreambuf_iterator() ) );
+ return static_cast( atoi(content.c_str()) );
+}
+
+int AccountManager::setLastAccountNumber(size_t number)
+{
+ std::ofstream ofs;
+ ofs.open(pathToAccountNumberFile, std::ios::trunc);
+ if(!ofs.is_open()) {
+ std::cout << " => Error: Account Number Datei ist nicht aufgemacht." << std::endl;
+ return 110;
+ }
+ //fStream.clear();
+ ofs << number << std::endl;
+ return 0;
+}
+
diff --git a/src/accountManager.h b/src/accountManager.h
index 883b552..5a698f6 100644
--- a/src/accountManager.h
+++ b/src/accountManager.h
@@ -1,36 +1,36 @@
-#ifndef ACCOUNTMANAGER_H
-#define ACCOUNTMANAGER_H
-
-
-
-#include
-#include
-#include
-
-struct Account {
- std::string Email,
- Password;
-};
-
-
-//wichtig vor Account declaration!!!!
-#include "parameterManager.h"
-
-class AccountManager
-{
-public:
- AccountManager(std::string pathToFile, std::string pathToAccountNumberFile, PAGE page, const PAGE * pagesALL);
- Account getNextAccount();
- size_t getLastAccountNumber();
- const PAGE * pagesALL;
-
-private:
- std::vector accounts;
- std::string pathToAccountNumberFile;
- PAGE pageInUse;
- int setLastAccountNumber(size_t number);
- int writeDefault(std::string path);
-
-};
-
-#endif // ACCOUNTMANAGER_H
+#ifndef ACCOUNTMANAGER_H
+#define ACCOUNTMANAGER_H
+
+
+
+#include
+#include
+#include
+
+struct Account {
+ std::string Email,
+ Password;
+};
+
+
+//wichtig vor Account declaration!!!!
+#include "parameterManager.h"
+
+class AccountManager
+{
+public:
+ AccountManager(std::string pathToFile, std::string pathToAccountNumberFile, PAGE page, const PAGE * pagesALL);
+ Account getNextAccount();
+ size_t getLastAccountNumber();
+ const PAGE * pagesALL;
+
+private:
+ std::vector accounts;
+ std::string pathToAccountNumberFile;
+ PAGE pageInUse;
+ int setLastAccountNumber(size_t number);
+ int writeDefault(std::string path);
+
+};
+
+#endif // ACCOUNTMANAGER_H
diff --git a/src/debug/S_New4.exe b/src/debug/S_New4.exe
new file mode 100644
index 0000000..518c740
Binary files /dev/null and b/src/debug/S_New4.exe differ
diff --git a/src/logger.cpp b/src/logger.cpp
index 28d3d95..65c6586 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,85 +1,85 @@
-#include "logger.h"
-
-Logger::Logger(std::string logFilePathm)
- : filePath(logFilePathm)
-{
- if(openFile(filePath))
- exit(234);
-}
-
-Logger::~Logger()
-{
- file.close();
-}
-
-std::string Logger::getFilePath()
-{
- return filePath;
-}
-
-int Logger::logCommandLine(std::string logText)
-{
- std::time_t now = std::time(nullptr);
- struct tm *tm_now = localtime(&now);
- std::string date((tm_now->tm_mday < 10 ? "0" : "") + std::to_string(tm_now->tm_mday) + "." +
- (tm_now->tm_mon +1 < 10 ? "0" : "" ) + std::to_string(tm_now->tm_mon +1) + "." +
- std::to_string(1900 + tm_now->tm_year) + " - " +
- (tm_now->tm_hour < 10 ? "0" : "" ) + std::to_string(tm_now->tm_hour) + ":" +
- (tm_now->tm_min < 10 ? "0" : "" ) + std::to_string(tm_now->tm_min));
- return writetoFile( " -> " + date + ": \"" + logText + "\"");
-}
-
-int Logger::logSubLine(std::string line)
-{
- return writetoFile("\t\t" + line);
-}
-
-std::string Logger::getLogText()
-{
- return std::string((std::istreambuf_iterator(file)), std::istreambuf_iterator());
-}
-
-int Logger::clearFile()
-{
- //close it
- file.close();
-
- //open it empty + close it
- std::ofstream ofs;
- ofs.open(filePath, std::ofstream::out | std::ofstream::trunc);
- if(!ofs.is_open()) {
- perror("Open File for clearing failed");
- return 35;
- }
- ofs.close();
-
- //reopen it
- return openFile(filePath);
-}
-
-int Logger::writetoFile(std::string t)
-{
- file << t << std::endl;
- return file.good();
-}
-
-int Logger::openFile(std::string path)
-{
- file.open(path, std::ios::in | std::ios::out | std::ios::app);
- if(!file.is_open()) {
- //Exestiert nicht => Erstelle Datei
- std::ofstream ofs(path);
- if(!ofs.is_open()) {
- perror((" => Error: Konnte LogDatei nicht erstellen: '" + path + "'").c_str());
- return (5656);
- } else {
- ofs.close();
- }
- file.open(path);
- if(!file.is_open()) {
- perror((" => Error: Konnte LogDatei nicht aufmachen: '" + path + "'").c_str());
- return (5657);
- }
- }
- return 0;
-}
+#include "logger.h"
+
+Logger::Logger(std::string logFilePathm)
+ : filePath(logFilePathm)
+{
+ if(openFile(filePath))
+ exit(234);
+}
+
+Logger::~Logger()
+{
+ file.close();
+}
+
+std::string Logger::getFilePath()
+{
+ return filePath;
+}
+
+int Logger::logCommandLine(std::string logText)
+{
+ std::time_t now = std::time(nullptr);
+ struct tm *tm_now = localtime(&now);
+ std::string date((tm_now->tm_mday < 10 ? "0" : "") + std::to_string(tm_now->tm_mday) + "." +
+ (tm_now->tm_mon +1 < 10 ? "0" : "" ) + std::to_string(tm_now->tm_mon +1) + "." +
+ std::to_string(1900 + tm_now->tm_year) + " - " +
+ (tm_now->tm_hour < 10 ? "0" : "" ) + std::to_string(tm_now->tm_hour) + ":" +
+ (tm_now->tm_min < 10 ? "0" : "" ) + std::to_string(tm_now->tm_min));
+ return writetoFile( " -> " + date + ": \"" + logText + "\"");
+}
+
+int Logger::logSubLine(std::string line)
+{
+ return writetoFile("\t\t" + line);
+}
+
+std::string Logger::getLogText()
+{
+ return std::string((std::istreambuf_iterator(file)), std::istreambuf_iterator());
+}
+
+int Logger::clearFile()
+{
+ //close it
+ file.close();
+
+ //open it empty + close it
+ std::ofstream ofs;
+ ofs.open(filePath, std::ofstream::out | std::ofstream::trunc);
+ if(!ofs.is_open()) {
+ perror("Open File for clearing failed");
+ return 35;
+ }
+ ofs.close();
+
+ //reopen it
+ return openFile(filePath);
+}
+
+int Logger::writetoFile(std::string t)
+{
+ file << t << std::endl;
+ return file.good();
+}
+
+int Logger::openFile(std::string path)
+{
+ file.open(path, std::ios::in | std::ios::out | std::ios::app);
+ if(!file.is_open()) {
+ //Exestiert nicht => Erstelle Datei
+ std::ofstream ofs(path);
+ if(!ofs.is_open()) {
+ perror((" => Error: Konnte LogDatei nicht erstellen: '" + path + "'").c_str());
+ return (5656);
+ } else {
+ ofs.close();
+ }
+ file.open(path);
+ if(!file.is_open()) {
+ perror((" => Error: Konnte LogDatei nicht aufmachen: '" + path + "'").c_str());
+ return (5657);
+ }
+ }
+ return 0;
+}
diff --git a/src/logger.h b/src/logger.h
index 4dbaee5..936ba4e 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -1,36 +1,36 @@
-#ifndef LOGGER_H
-#define LOGGER_H
-
-
-
-#include
-#include
-#include
-#include
-#include // std::time, localtime ...
-
-
-#include "parameterManager.h"
-
-
-class Logger
-{
-public:
- Logger(std::string logFilePathm);
- ~Logger();
- std::string getFilePath();
- std::fstream file;
-
- int logCommandLine(std::string logText);
- int logSubLine(std::string line);
- std::string getLogText();
- int clearFile();
-
-
-private:
- std::string filePath;
- int writetoFile(std::string t);
- int openFile(std::string path);
-};
-
-#endif // LOGGER_H
+#ifndef LOGGER_H
+#define LOGGER_H
+
+
+
+#include
+#include
+#include
+#include
+#include // std::time, localtime ...
+
+
+#include "parameterManager.h"
+
+
+class Logger
+{
+public:
+ Logger(std::string logFilePathm);
+ ~Logger();
+ std::string getFilePath();
+ std::fstream file;
+
+ int logCommandLine(std::string logText);
+ int logSubLine(std::string line);
+ std::string getLogText();
+ int clearFile();
+
+
+private:
+ std::string filePath;
+ int writetoFile(std::string t);
+ int openFile(std::string path);
+};
+
+#endif // LOGGER_H
diff --git a/src/main.cpp b/src/main.cpp
index d72837f..cf7514f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,21 +1,21 @@
-#include "programManager.h"
-
-
-int main(int argc, char *argv[])
-{
- ProgramManager mainProgram;
- Settings settings;
- int res = manageParameter(settings, argc, argv);
- if(res == -1)
- return 0;
- else if(res != 0) {
- if(settings.debugMode)
- std::cout << " => Error: Das Auswerten der Parameter ist fehlgeschlagen!" << std::endl;
- return res;
- } else {
- if( (res = mainProgram.start(&settings)) != 0 )
- std::cout << (" => Entschuldigung, ein Fehler ist aufgetreten!\n Bei wiederholtem Auftreten verwenden Sie -d, --debug für mehr Infos\n"
- " oder --update um, falls vorhanden, auf eine neuere Version des Programms zu wechseln") << std::endl;
- return res;
- }
-}
+#include "programManager.h"
+
+
+int main(int argc, char *argv[])
+{
+ ProgramManager mainProgram;
+ Settings settings;
+ int res = manageParameter(settings, argc, argv);
+ if(res == -1)
+ return 0;
+ else if(res != 0) {
+ if(settings.debugMode)
+ std::cout << " => Error: Das Auswerten der Parameter ist fehlgeschlagen!" << std::endl;
+ return res;
+ } else {
+ if( (res = mainProgram.start(&settings)) != 0 )
+ std::cout << (" => Entschuldigung, ein Fehler ist aufgetreten!\n Bei wiederholtem Auftreten verwenden Sie -d, --debug für mehr Infos\n"
+ " oder --update um, falls vorhanden, auf eine neuere Version des Programms zu wechseln") << std::endl;
+ return res;
+ }
+}
diff --git a/src/pageManager.cpp b/src/pageManager.cpp
index 572b1fb..e3b796c 100644
--- a/src/pageManager.cpp
+++ b/src/pageManager.cpp
@@ -1,724 +1,727 @@
-
-#include "pageManager.h"
-
-PageManager::PageManager(std::string sock5ProxyOnlyAddress)
- : sock5Proxy("socks5://" + sock5ProxyOnlyAddress)
-{
- curl_global_init(CURL_GLOBAL_ALL);
- if(false)
- std::cout << "PageManager()" << std::endl;
-}
-
-PageManager::~PageManager()
-{
- curl_global_cleanup();
- if(false)
- std::cout << "~PageManager()" << std::endl;
-}
-
-void PageManager::setProxy(std::string ip, int port)
-{
- if(!port) {
- if(debugMode)
- std::cout << " => INFO: Es wird kein Proxy verwendet." << std::endl;
- this->sock5Proxy = "";
- } else {
- this->sock5Proxy = "socks5://" + ip + ":" + std::to_string(port);
- if(debugMode)
- std::cout << "Proxy: " << ip << ":" << port << std::endl;
- }
-}
-
-
-
-void PageManager::setDebugMode(bool status)
-{
- this->debugMode = status;
-}
-
-//Save reply to string
-size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
-{
- //Function für CURL
- static_cast(userp)->append(static_cast(contents),size * nmemb);
- return size * nmemb;
-}
-
-//Write data to file
-static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
-{
- size_t written = fwrite(ptr, size, nmemb, reinterpret_cast(stream));
- return written;
-}
-
-
-#include
-
-#if defined(_WIN32)
-//#define WIN32_LEAN_AND_MEAN
-//#define VC_EXTRALEAN
-#include
-#elif defined(__linux__)
-#include
-#endif // Windows/Linux
-
-void PageManager::get_terminal_size(int& width) {
-#if defined(_WIN32)
- CONSOLE_SCREEN_BUFFER_INFO csbi;
- if( GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi) == 0 ) {
- //if ( debugMode )
- //std::cout << " => WARNING: GetConsoleScreenBufferInfo failed => Use 9999 as max Msg-Length" << std::endl;
- return;
- }
-
- width = (int)(csbi.dwSize.X);
-#elif defined(__linux__)
- struct winsize w;
- ioctl(fileno(stdout), TIOCGWINSZ, &w);
- width = (int)(w.ws_col);
-#endif // Windows/Linux
-}
-
-Reply PageManager::getServerRequest(std::string protocol, std::string Url, bool useCookies, std::string data, bool generateCookieFile, bool UrlAfterRedirectOnlyNeeded, std::string cookieFilePath)
-{
- Url = protocol + Url; // add https://
-
- CURL *curl;
- CURLcode res;
- std::string readBuffer;
- char *url;
- std::string returnUrl;
-
-
- int width = 0;
- get_terminal_size(width);
- if(width < 1)
- width = 999999;
-
- //info ausgabe
- std::cout << ( "\33[2K\rLade: '" + std::string(Url).erase( (((width - 12) < (int)Url.length()) ? (width - 12) : Url.length() ) ) + "'..." + ((debugMode) ? "\n" : "" )) << std::flush;
-
- curl = curl_easy_init();
- if(!curl) {
- perror("\33[2K\r => Error: Curl easy init failed");
- return Reply("-1");
- }
-
- //Settings
- if(sock5Proxy != "")
- curl_easy_setopt(curl, CURLOPT_PROXY, sock5Proxy.c_str() ); //Sock5Proxy für Curl
- else if(debugMode)
- std::cout << "\33[2K\r => INFO: Es wird kein Proxy verwendet." << std::endl;
-
- //curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); // html errors to errorcode res
- //curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); // Progressausgabe aktivieren
-
-#ifdef noSLLCheck
- // TODO: SET IT BACK
- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
-#endif
-
-
- curl_easy_setopt(curl, CURLOPT_URL, Url.c_str()); //Url für Curl
- curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); //follows redirection
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback); // Funktion zum Speichern des outputs in einem string
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer); //Legt die Variable readbuffer fest
- curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:80.0) Gecko/20100101 Firefox/80.0");
- if(useCookies)
- curl_easy_setopt(curl, CURLOPT_COOKIEFILE, cookieFilePath.c_str());
- if(data != "")
- curl_easy_setopt (curl, CURLOPT_POSTFIELDS, data.c_str());
- if(generateCookieFile)
- curl_easy_setopt (curl, CURLOPT_COOKIEJAR, cookieFilePath.c_str());
-
- int maxTimeout = 10;
- for (int timeout = 1; timeout <= maxTimeout; ++timeout) {
- /* Perform the request, res will get the return code */
- res = curl_easy_perform(curl);
- std::cout << "\33[2K\r" << std::flush;
-
- if(res != CURLE_OK) {
- if(timeout == maxTimeout) {
- perror((std::string("\33[2K\r => Error: curl_easy_perform() failed: ") + curl_easy_strerror(res)).c_str());
- return Reply("-1");
- } else {
-
- //Try to use to (new) url
- if(UrlAfterRedirectOnlyNeeded) {
- res = curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
- if( res != CURLE_OK || !url ) {
- perror((std::string("\33[2K\r => Error: curl_easy_getinfo failed: ") + curl_easy_strerror(res)).c_str());
- return Reply("-1");
- } else {
- if(url != Url) {
- if(debugMode)
- std::cout << " => WARNING: Use Url after Error getServerRequest, cause it chanced and only url needed" << std::endl;
- Url = url; // after curl_easy_cleanup(), url (char * ) == invalid
- curl_easy_cleanup(curl);
- return Reply("", Url);
- } else {
- if(debugMode)
- std::cout << " => WARNING: Want to Use Url after Error getServerRequest, but url didn't chacnge, too" << std::endl;
- }
- }
- }
-
- std::cout << std::string( "\33[2K\r => Warning: Versuch " + std::to_string(timeout) + " von " + std::to_string(maxTimeout) + ": curl_easy_perform() failed: " + curl_easy_strerror(res) )<< std::flush;
- sleep(1);
- }
- } else {
- break;
- }
-
- }
-
- //Get Url
- res = curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
- if( res != CURLE_OK || !url ) {
- perror((std::string("\33[2K\r => Error: curl_easy_getinfo failed: ") + curl_easy_strerror(res)).c_str());
- return Reply("-1");
- } else
- returnUrl=url;
-
-
- /* always cleanup */ /* Mach den Griff zu, schreib die Kekse! */
- curl_easy_cleanup(curl);
-
- return Reply(readBuffer, returnUrl);
-}
-
-
-int PageManager::downLoadToFile(std::string filePath, std::string url)
-{
- CURL *curl_handle;
- FILE *pagefile;
- CURLcode res;
-
- /* open the file */
- pagefile = fopen(filePath.c_str(), "wb"); // w == write; b == binäre
- if(!pagefile) {
- perror("Open File filed");
- return 1;
- }
-
- //Info ausgabe
- std::cout << ( "\33[2K\rDownloade: '" + url + "'..." + ((debugMode) ? "\n" : "" )) << "\33[2K\r" << std::flush;
-
- /* init the curl session */
- curl_handle = curl_easy_init();
- if(!curl_handle) {
- perror("\33[2K\r => Error: Curl easy init failed");
- return 2;
- }
-
-#ifdef noSLLCheck
- // TODO: SET IT BACK
- curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
-#endif
-
-
- /* set URL to get here */
- curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str());
-
- /* Switch on full protocol/debug output while testing */
- curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, false);
-
- /* disable progress meter, set to 0L to enable and disable debug output */
- curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, false);
-
- /* send all data to this function */
- curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, write_data);
-
- //Sock5Proxy für Curl
- if(sock5Proxy != "")
- curl_easy_setopt(curl_handle, CURLOPT_PROXY, sock5Proxy.c_str() ); //Sock5Proxy für Curl
- else if(debugMode)
- std::cout << "\33[2K\r => INFO: Es wird kein Proxy verwendet." << std::endl;
-
- //User Agent
- curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:80.0) Gecko/20100101 Firefox/80.0");
-
- /* write the page body to this file handle */
- curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, pagefile);
-
- //Error 404, for example => not found
- curl_easy_setopt(curl_handle, CURLOPT_FAILONERROR, true);
-
- int maxTimeOut = 5;
- bool failed = false;
- for (int timeout = 1; timeout <= maxTimeOut; ++timeout) {
- /* get it! */
- if( (res = curl_easy_perform(curl_handle)) != CURLE_OK ) {
- //Wenns fehlschlägt error ( + wiederversuchen )
- if(timeout == maxTimeOut) {
- perror((std::string("\33[2K\r => Error: curl_easy_perform() failed: ") + curl_easy_strerror(res)).c_str());
- failed = true;
- } else {
- std::cout << std::string( "\33[2K\r => Warning: Versuch " + std::to_string(timeout) + " von " + std::to_string(maxTimeOut) + ": curl_easy_perform() failed: " + curl_easy_strerror(res) )<< std::flush;
- sleep(1);
- }
- } else {
- //Sonst ( wenns functioniert) schleife verlassen
- break;
- }
- }
-
- /* close the header file */
- if(fclose(pagefile) != 0) {
- perror(" => Error: fclose failed");
- return 4;
- }
-
- /* cleanup curl stuff */
- curl_easy_cleanup(curl_handle);
-
- return (failed) ? 10 : 0;
-}
-
-int PageManager::login(PAGE page, Account account, std::string cookieFilePath)
-{
- if(debugMode)
- std::cout << " > Melde mit neuem Account an: Email: " << account.Email << " Passowort: " << account.Password << std::endl;
-
- auto reply = getServerRequest( page.protocol, page.url + "/login", false, std::string("email=" + account.Email + "&password=" + account.Password), true, false, cookieFilePath );
- std::string html = reply.html;
-
- auto fs = std::vector();
- fs.push_back("/home/markus/aaaaaaaaaaaaaaaaaaaaaaaa.html");
- this->writeToFile(fs, html);
-
- if(html == "" )
- return 0;
- else if (html.find("Das Feld Email muss eine gültige E-Mail-Adresse enthalten.") != std::string::npos)
- std::cout << " => Error: Login failed: Das Feld Email muss eine gültige E-Mail-Adresse enthalten." << std::endl
- << " Email: '" << account.Email << "' Passwort: '" << account.Password << "'" << std::endl;
- else if (html.find("Das Passwort ist nicht korrekt") != std::string::npos)
- std::cout << " => Error: Login failed: Das Passwort ist nicht korrekt." << std::endl
- << " Email: '" << account.Email << "' Passwort: '" << account.Password << "'" << std::endl;
- else if (html.find("Ein Account mit dieser E-Mail Adresse wurde nicht gefunden.") != std::string::npos)
- std::cout << " => Error: Login failed: Ein Account mit dieser E-Mail Adresse wurde nicht gefunden." << std::endl
- << " Email: '" << account.Email << "' Passwort: '" << account.Password << "'" << std::endl;
- else if (html.find("Dein Internetzugang wird zensiert (DNS-Sperre)" ) != std::string::npos)
- std::cout << " => Error: Login failed: Dein Internetzugang wird zensiert (DNS-Sperre) -> Verwende IP?" << std::endl
- << " Email: '" << account.Email << "' Passwort: '" << account.Password << "'" << std::endl;
- else if(html == "-1")
- return -1;
- else
- std::cout << " => Error: Login failed: Keine Weiterleitung bei Login." << std::endl
- << " Email: '" << account.Email << "' Passwort: '" << account.Password << "'" << std::endl;
- return -1;
-}
-
-Reply PageManager::getUrlAfterRedirect( std::string p,std::string Url, std::string cookieFilePath)
-{
- return getServerRequest(p , Url, true, "", false, true, cookieFilePath);
-}
-
-checkNameRply PageManager::checkName(std::vector &pages, std::string Name, bool useFirstPage)
-{
- if(pages.size() < 1) {
- std::cout << " => Error Keine Internet Seiten vorhanden." << std::endl;
- return checkNameRply("", PAGE(), checkNameRply::FAILED);
- }
-
- //überprüfe, auf welchen seite die serie existiert, wenn parameter
- //für automatisch erste Seite aktiv ist, dann wähl aus, sonst manuel auswahl
-
- int count = 0;
- std::string name = replace(Name, " ", "-");
- std::string pagesonExist;
- PAGE Page;
-
- //für jede Seite
- for ( unsigned i = 0; i < pages.size(); i++ ) {
-
- std::string html = getServerRequest(pages.at(i).protocol, pages.at(i).url + pages.at(i).UrlDir + name).html;
- if(html.find("Die gewünschte Serie wurde nicht gefunden oder ist im Moment deaktiviert.") != std::string::npos) {
- continue;
-
- } else if (html.find("404 - Seite nicht gefunden") != std::string::npos) {
- std::cout << "\33[2K\r" <<" => Ungültiger Name: '" << Name << "'" << std::endl;
- continue;
-
- } else if (html == "-1" || html == "") {
- std::cout << "\33[2K\r" <<" => WARNUNG: Das laden der Seite : '" << pages.at(i).url << "' ist fehlgeschlagen" << std::endl;
-
- pages.erase(pages.begin() + i);
- i--;
- continue;
-
- }
- else {
- count ++;
- pagesonExist += pages.at(i).url + " ";
- Page = pages.at(i);
-
- if(useFirstPage) {
- if(debugMode)
- std::cerr << "Nimm gleiche diese Seite, da useFirstPage auf true ist" << std::endl;
- break; // nimm gleich das erste
- }
- }
- }
-
- //
- if( count == 1 ) {
- std::cout << "\33[2K\r > Name: " << name << std::endl;
- return checkNameRply(name, Page, checkNameRply::SUCCESS);;
- } else if ( count > 1) {
- std::cout << "\33[2K\r => Die Serie existiert auf mehreren Seiten " << name << ": '" << pagesonExist << "'" << std::endl;
- std::cout << "\33[2K\r Benutze die Option -f --use-first, um automatisch die 1. Seite zu verwenden!" << std::endl;
- return checkNameRply("", PAGE(), checkNameRply::MULTIPLE_OPTIONS); //MULTIPLE OPTIONS FOUND!!!! same option -> führe suche funktion aus
-
- } else if( count == 0 && pages.size() == 0) {
- //keine suche wenn es keine funktionierende seite gibt
- return checkNameRply("", PAGE(), checkNameRply::NO_WORKING_PAGE);
-
- } // führe suche aus...
- else {
- std::cout << "\33[2K\r => Die gewünschte Serie wurde nicht gefunden oder ist im Moment deaktiviert: '" << Name << "'" << std::endl;
- return checkNameRply("", PAGE(), checkNameRply::NOTHING_FOUND);
- }
-
-}
-
-std::string PageManager::getLinks(std::string HTML)
-{
- //Entderne alles vor den Links
- size_t pos = HTML.find("");
- if(pos == std::string::npos) {
- std::cout << " => Error: Konnte Position von \"" << "" << " nicht finden" <" /*correkter HTML absatz*/, "