diff --git a/.gitignore b/.gitignore index dce9578..e6d4724 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ -.DS_Store -FeedTheMonkey.pro.user* build +dist +.DS_Store +FeedTheMonkey.app +FeedTheMonkey.egg-info/ +feedthemonkey.egg-info/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fcc6e8d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: cpp -compiler: gcc -sudo: require -dist: trusty -before_install: -- sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y -- sudo apt-get update -qq -install: -- sudo apt-get -y install qt58base qt58webengine qt58quickcontrols -- source /opt/qt58/bin/qt58-env.sh -script: -- qmake PREFIX=/usr -- make -j4 -- sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/ -- wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -- chmod a+x linuxdeployqt*.AppImage -- unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH -- "./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/ - -bundle-non-qt-libs" -- "./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/ - -appimage" -- find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " - -f 2-3 | sort | uniq -- mv FeedTheMonkey*.AppImage FeedTheMonkey.AppImage -deploy: - provider: releases - api_key: - secure: d+hHwOnmeLPVvuue6VDCs2LwLS+BFzJF/BB5iObtkCYBwQ8ybnVzUcgnjJKOt37SHI0T9kLegI+Lq/843ECYiGiDjQg4PvCF69V8ODgHv3v1qiN5oG/eroBXd83a0+xhi4BuJt0SwcV9mcv4uD9bCPhj944rmMLH+3qD4ysgImBmbYSbbLecE9+QAs7bfrCwQRfdCePBORX3FHa/p12NEtln7xv6ZRyku9LdJSzAcdgm4zc95ggTAVC1+aQB6J0q2QzWPlQcOkLx+ZYmOqClhbSMFpIyPXP8UpXjYyvUlTAd0+wH8BGf0O3lpOqACc7IKIbj9d5oPmghVZo55SyW+RR77G+az+IbGJ7iXZsMfQZsMvtB7hNYhNvUUxQrAau7Y/ve+6sMQmvA7aMHV8kDUvnNW/c2r2jAWwk+N8QzGcP/rclDCKeOWZqZABmrzTViXZVAeXh4hJ8r6mbq8iwagBUPCsVYhVuerQt/KIoWxyn6/1GmMfKGi3dA/v3u1qU61vzrz3yLlJBmUAVPxZdVmqfRweh4BXjImxFMFmf5PYm5FnDg1gmw8rWsgii7+IPYw7DjTAHpjYbtXvDwDgG1nRXiRp2TGtPPgKW1/Uk8r/j5vfB5WcEZ7exLUgsPPjny5MGvzjqOxeLvwK1Pg9jFBFXIx7l1tNMJQxQU0r3DmBg= - file: FeedTheMonkey.AppImage - on: - repo: jeena/FeedTheMonkey - skip_cleanup: true - draft: true diff --git a/COPYING b/COPYING deleted file mode 100644 index 94a9ed0..0000000 --- a/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - 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. - - - Copyright (C) - - 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: - - Copyright (C) - 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/FeedTheMonkey.pro b/FeedTheMonkey.pro deleted file mode 100644 index 91d3739..0000000 --- a/FeedTheMonkey.pro +++ /dev/null @@ -1,66 +0,0 @@ -requires(contains(QT_CONFIG, accessibility)) - -qtHaveModule(widgets) { - QT += widgets # QApplication is required to get native styling with QtQuickControls -} - -TARGET = feedthemonkey - -TEMPLATE = app -QT += qml quick webenginewidgets webengine -CONFIG += c++11 -CONFIG += qtquickcompiler - -SOURCES += \ - src/main.cpp \ - src/post.cpp \ - src/tinytinyrss.cpp \ - src/tinytinyrsslogin.cpp - -RESOURCES += \ - html/html.qrc \ - qml/qml.qrc \ - -mac { - RC_FILE = misc/Icon.icns - TARGET = FeedTheMonkey -} - -unix { - isEmpty(PREFIX) { - PREFIX = /usr/local - } - - target.path = $$PREFIX/bin - - shortcutfiles.files = misc/feedthemonkey.desktop - shortcutfiles.path = $$PREFIX/share/applications/ - data.files += misc/feedthemonkey.xpm - data.path = $$PREFIX/share/pixmaps/ - - INSTALLS += shortcutfiles - INSTALLS += data -} - -INSTALLS += target - - -# Needed for bringing browser from background to foreground using QDesktopServices: http://bugreports.qt-project.org/browse/QTBUG-8336 -TARGET.CAPABILITY += SwEvent - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -OTHER_FILES += - -HEADERS += \ - src/post.h \ - src/tinytinyrss.h \ - src/tinytinyrsslogin.h - -DISTFILES += \ - misc/feedthemonkey.desktop \ - misc/feedthemonkey.xpm \ - misc/Icon.icns \ - README.md \ - LICENSE.txt diff --git a/misc/Icon.icns b/Icon.icns similarity index 100% rename from misc/Icon.icns rename to Icon.icns diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d740e0b --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,30 @@ + BSD license + =========== + +Copyright (c) 2013, Jeena Paradies +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +- Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +- Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +- Neither the name of Bungloo nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + diff --git a/README.md b/README.md index 155358a..444043d 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,34 @@ -# FeedTheMonkey +Icon -Icon +# Feed the Monkey -FeedTheMonkey is a desktop client for [TinyTinyRSS](http://tt-rss.org). That means that -it doesn't work as a standalone feed reader but only as a client for the TinyTinyRSS API -which it uses to get the normalized feeds and to synchronize the "article read" marks. +Feed the Monkey is a desktop client for [TinyTinyRSS](http://tt-rss.org). That means that it doesn't work as a standalone feed reader but only as a client for the TinyTinyRSS API which it uses to get the normalized feeds and to synchronize the "article read" marks. -It is written in C++ with Qt and QML, it also uses Blink to show the contents. You need -to have Qt 5.6 installed to be able to compile and have a account on a TinyTinyRSS server. +It is written in PyQt and uses WebKit to show the contents. + +You need to have PyQt installed and a account on a TinyTinyRSS server. + +License: BSD ## Installation -If you run Linux then there is an AppImage on the [Latest release](https://github.com/jeena/FeedTheMonkey/releases/latest) page. You download it, make executable and are able to run, it should work on most of the distributions out there. +### Linux + Windows -For ArchLinux I package it and it's available on https://aur.archlinux.org/packages/feedthemonkey/ +Download the [ZIP](https://github.com/jeena/feedthemonkey/archive/master.zip)-file, unzip it and then run: -You can compile and install it everywhere Qt is suported, this means on macOS, Windows -and Linux. +On Linux you can just do (if you have PyQt4, python2 and python2-autotools already installed): +`sudo python2 setup.py install` + +On Windows you need to install (those are links to the binary packages): + +- [Python2 x32](http://www.python.org/ftp/python/2.7.4/python-2.7.4.msi) or [Python x64](http://www.python.org/ftp/python/2.7.4/python-2.7.4.amd64.msi) +- [PyQt4 x32](http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.10.1/PyQt4-4.10.1-gpl-Py2.7-Qt4.8.4-x32.exe) or [PyQt x64](http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.10.1/PyQt4-4.10.1-gpl-Py2.7-Qt4.8.4-x64.exe) + +Then rename `feedthemonkey` to `feedthemonkey.pyw` and then you can run it by double-clicking. + +### OS X + +Download [FeedTheMonkey.app.zip](http://jabs.nu/feedthemonkey/download/FeedTheMonkey.app.zip) unzip it and move it to your Applications folder. After that just run it like every other app. ## Keyboard shortcuts @@ -26,40 +38,21 @@ The keyboard shortcuts are inspired by other feed readers which are inspired by `k` or `←` show previous article `n` or `Return` open current article in the default browser `r` reload articles -`F11` full screen -`1` night mode +`s` star current article +`Ctrl S` show starred articles `Ctrl Q` quit `Ctrl +` zoom in `Ctrl -` zoom out -`Ctrl 0` reset zoom +`Ctrl 0` reset zoom -On macOS use `Cmd` instead of `Ctrl`. +On OS X use `Cmd` instead of `Ctrl`. ## Trivia -This is version 2 of FeedTheMonkey, you can find version 1 which was written in PyQt in the v1 branch -of this repo. My goal is to make this usable on many different targets, for now it is only for -the use on a desktop computer but I'd like to see it on a mobile device too. +I just hacked together this one within one day so it is not feature complete yet and has no real error handling. + +Right now it only loads unread articles and shows them one after another. I might add a sidebar in the future, we will see. ## Screenshot -![Feed the Monkey screenshot](http://jeena.net/feedthemonkey/feedthemonkey-dark.png) - -## License - -This file is part of FeedTheMonkey. - -Copyright 2015-2017 Jeena - -FeedTheMonkey 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. - -FeedTheMonkey 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 FeedTheMonkey. If not, see . +![Feed the Monkey screenshot](http://jabs.nu/feedthemonkey/feedthemonkey-screenshot.png) \ No newline at end of file diff --git a/build-osx.sh b/build-osx.sh new file mode 100755 index 0000000..1704cfa --- /dev/null +++ b/build-osx.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +HERE=`pwd` +TMP="/tmp" + +rm -rf FeedTheMonkey.app +rm -rf $TMP/feedthemonkey +mkdir $TMP/feedthemonkey +cp Icon.icns $TMP/feedthemonkey/ +cp setup.py $TMP/feedthemonkey +cp feedthemonkey $TMP/feedthemonkey/ +cd $TMP/feedthemonkey +python setup.py py2app +mv $TMP/feedthemonkey/dist/FeedTheMonkey.app $HERE +cd $HERE +rm -rf $TMP/feedthemonkey +FeedTheMonkey.app/Contents/MacOS/FeedTheMonkey \ No newline at end of file diff --git a/feedthemonkey b/feedthemonkey new file mode 100755 index 0000000..d660194 --- /dev/null +++ b/feedthemonkey @@ -0,0 +1,570 @@ +#!/usr/bin/env python2 + +try: + import urllib.request as urllib2 +except: + import urllib2 + +import sys, os, json, tempfile, urllib, json +from PyQt4 import QtGui, QtCore, QtWebKit, QtNetwork +from PyQt4.QtNetwork import * +from threading import Thread +from sys import platform as _platform + +settings = QtCore.QSettings("jabs.nu", "feedthemonkey") + +class MainWindow(QtGui.QMainWindow): + def __init__(self): + QtGui.QMainWindow.__init__(self) + self.setWindowIcon(QtGui.QIcon("feedmonkey")) + self.addAction(QtGui.QAction("Full Screen", self, checkable=True, toggled=lambda v: self.showFullScreen() if v else self.showNormal(), shortcut="F11")) + self.history = self.get("history", []) + self.restoreGeometry(QtCore.QByteArray.fromRawData(settings.value("geometry").toByteArray())) + self.restoreState(QtCore.QByteArray.fromRawData(settings.value("state").toByteArray())) + + self.initUI() + + session_id = self.get("session_id") + server_url = self.get("server_url") + + if not (session_id and server_url): + self.authenticate() + else: + self.initApp() + + def initUI(self): + self.list = List(self) + self.content = Content(self) + + self.splitter = QtGui.QSplitter(QtCore.Qt.Vertical, self) + self.splitter.setHandleWidth(1) + self.splitter.addWidget(self.list) + self.splitter.addWidget(self.content) + self.splitter.restoreState(settings.value("splitterSizes").toByteArray()); + self.splitter.splitterMoved.connect(self.splitterMoved) + + self.setCentralWidget(self.splitter) + + def mkAction(name, connect, shortcut=None): + action = QtGui.QAction(name, self) + action.triggered.connect(connect) + if shortcut: + action.setShortcut(shortcut) + return action + + mb = self.menuBar() + + fileMenu = mb.addMenu("&File") + fileMenu.addAction(mkAction("&Close", self.close, "Ctrl+W")) + fileMenu.addAction(mkAction("&Log Out", self.logOut)) + fileMenu.addSeparator() + fileMenu.addAction(mkAction("&Exit", self.close, "Ctrl+Q")) + + actionMenu = mb.addMenu("&Action") + actionMenu.addAction(mkAction("&Reload", self.content.reload, "R")) + actionMenu.addAction(mkAction("Show &Starred", self.content.showStarred, "Ctrl+S")) + actionMenu.addAction(mkAction("Set &Starred", self.content.setStarred, "S")) + actionMenu.addAction(mkAction("Set &Unread", self.content.setUnread, "U")) + actionMenu.addAction(mkAction("&Next", self.content.showNext, "J")) + actionMenu.addAction(mkAction("&Previous", self.content.showPrevious, "K")) + actionMenu.addAction(mkAction("&Open in Browser", self.content.openCurrent, "N")) + + viewMenu = mb.addMenu("&View") + viewMenu.addAction(mkAction("Zoom &In", lambda: self.content.wb.setZoomFactor(self.content.wb.zoomFactor() + 0.2), "Ctrl++")) + viewMenu.addAction(mkAction("Zoom &Out", lambda: self.content.wb.setZoomFactor(self.content.wb.zoomFactor() - 0.2), "Ctrl+-")) + viewMenu.addAction(mkAction("&Reset", lambda: self.content.wb.setZoomFactor(1), "Ctrl+0")) + + windowMenu = mb.addMenu("&Window") + windowMenu.addAction(mkAction("Reset to Default", self.resetSplitter, "Ctrl+D")) + + helpMenu = mb.addMenu("&Help") + helpMenu.addAction(mkAction("&About", lambda: QtGui.QDesktopServices.openUrl(QtCore.QUrl("http://jabs.nu/feedthemonkey", QtCore.QUrl.TolerantMode)) )) + + def initApp(self): + session_id = self.get("session_id") + server_url = self.get("server_url") + self.tinyTinyRSS = TinyTinyRSS(self, server_url, session_id) + + self.content.evaluateJavaScript("setArticle('loading')") + self.content.reload() + self.show() + + def closeEvent(self, ev): + settings.setValue("geometry", self.saveGeometry()) + settings.setValue("state", self.saveState()) + return QtGui.QMainWindow.closeEvent(self, ev) + + def put(self, key, value): + "Persist an object somewhere under a given key" + settings.setValue(key, json.dumps(value)) + settings.sync() + + def get(self, key, default=None): + "Get the object stored under 'key' in persistent storage, or the default value" + v = settings.value(key) + return json.loads(unicode(v.toString())) if v.isValid() else default + + def setWindowTitle(self, t): + super(QtGui.QMainWindow, self).setWindowTitle("Feed the Monkey" + t) + + def splitterMoved(self, pos, index): + settings.setValue("splitterSizes", self.splitter.saveState()); + + def resetSplitter(self): + sizes = self.splitter.sizes() + top = sizes[0] + bottom = sizes[1] + sizes[0] = 200 + sizes[1] = bottom + top - 200 + self.splitter.setSizes(sizes) + + def authenticate(self): + + dialog = Login() + + def callback(): + + server_url = str(dialog.textServerUrl.text()) + user = str(dialog.textName.text()) + password = str(dialog.textPass.text()) + + session_id = TinyTinyRSS.login(server_url, user, password) + if session_id: + self.put("session_id", session_id) + self.put("server_url", server_url) + self.initApp() + else: + self.authenticate() + + dialog.accepted.connect(callback) + + dialog.exec_() + + def logOut(self): + self.hide() + self.content.evaluateJavaScript("setArticle('logout')") + self.tinyTinyRSS.logOut() + self.tinyTinyRSS = None + self.put("session_id", None) + self.put("server_url", None) + self.authenticate() + +class List(QtGui.QTableWidget): + def __init__(self, container): + QtGui.QTableWidget.__init__(self) + self.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) + self.app = container + self.itemSelectionChanged.connect(self.rowSelected) + self.setShowGrid(False) + self.setAlternatingRowColors(True) + + def initHeader(self): + self.clear() + self.setColumnCount(5) + self.setHorizontalHeaderLabels(("*", "Feed", "Title", "Date", "Author")) + self.horizontalHeader().setResizeMode(0, QtGui.QHeaderView.ResizeToContents) + self.horizontalHeader().setResizeMode(1, QtGui.QHeaderView.ResizeToContents) + self.horizontalHeader().setResizeMode(2, QtGui.QHeaderView.Stretch) + self.horizontalHeader().setResizeMode(3, QtGui.QHeaderView.ResizeToContents) + self.horizontalHeader().setResizeMode(4, QtGui.QHeaderView.ResizeToContents) + self.verticalHeader().hide() + + def setItems(self, articles): + self.initHeader() + self.setRowCount(len(articles)) + row = 0 + for article in articles: + if "marked" in article: + starred = QtGui.QTableWidgetItem("*" if article["marked"] else "") + starred.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.setItem(row, 0, starred) + if "feed_title" in article: + feed_title = QtGui.QTableWidgetItem(article["feed_title"]) + feed_title.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.setItem(row, 1, feed_title) + if "title" in article: + title = QtGui.QTableWidgetItem(article["title"]) + title.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.setItem(row, 2, title) + if "updated" in article: + date = QtCore.QDateTime.fromTime_t(article["updated"]).toString(QtCore.Qt.SystemLocaleShortDate) + d = QtGui.QTableWidgetItem(date) + d.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.setItem(row, 3, d) + if "author" in article: + author = QtGui.QTableWidgetItem(article["author"]) + author.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.setItem(row, 4, author) + self.resizeRowToContents(row) + row += 1 + self.selectRow(0) + + def rowSelected(self): + indexes = self.selectedIndexes() + if len(indexes) > 0: + row = indexes[0].row() + self.app.content.showIndex(row) + + def updateRead(self): + for row, article in enumerate(self.app.content.unread_articles): + for x in xrange(0,5): + item = self.item(row, x) + font = item.font() + font.setBold(article["unread"]) + item.setFont(font) + + def setStarred(self, index, starred): + widget = self.itemAt(index, 0) + widget.setText("*" if starred else "") + + +class Content(QtGui.QWidget): + def __init__(self, container): + QtGui.QWidget.__init__(self) + + self.app = container + self.index = 0 + + self.wb = QtWebKit.QWebView(titleChanged=lambda t: container.setWindowTitle(t)) + self.wb.page().setLinkDelegationPolicy(QtWebKit.QWebPage.DelegateAllLinks) + self.wb.linkClicked.connect(lambda url: self.openLink(url)) + + diskCache = QNetworkDiskCache() + diskCache.setCacheDirectory("/tmp/feedmonkey") + diskCache.setMaximumCacheSize(5*124*124) + self.wb.page().networkAccessManager().setCache(diskCache) + + self.setLayout(QtGui.QVBoxLayout(spacing=0)) + self.layout().setContentsMargins(0, 0, 0, 0) + self.layout().addWidget(self.wb) + + self.do_show_next = QtGui.QShortcut(QtCore.Qt.Key_Right, self, activated=self.showNext) + self.do_show_previous = QtGui.QShortcut(QtCore.Qt.Key_Left, self, activated=self.showPrevious) + self.do_open = QtGui.QShortcut("Return", self, activated=self.openCurrent) + + self.wb.settings().setAttribute(QtWebKit.QWebSettings.PluginsEnabled, True) + self.wb.settings().setIconDatabasePath(tempfile.mkdtemp()) + self.wb.setHtml(self.templateString()) + + self.unread_articles = [] + + def openLink(self, url): + QtGui.QDesktopServices.openUrl(url) + + def reload(self): + w = WorkerThread(self.app, self._reload) + self.connect(w, QtCore.SIGNAL("reload_done()"), self.reload_done) + w.start() + + def showStarred(self): + w = WorkerThread(self.app, self._showStarred) + self.connect(w, QtCore.SIGNAL("reload_done()"), self.reload_done) + w.start() + + def setUnread(self): + article = self.unread_articles[self.index] + article["unread"] = True + article["set_unread"] = True + self.app.list.updateRead() + self.app.tinyTinyRSS.setArticleRead(article["id"], False) + + def setStarred(self): + article = self.unread_articles[self.index] + article["marked"] = not article["marked"] + self.app.tinyTinyRSS.setArticleStarred(article["id"], article["marked"]) + self.app.list.setStarred(self.index, article["marked"]) + self.setArticle(article) + + def _reload(self): + self.unread_articles = self.app.tinyTinyRSS.getUnreadFeeds() + self.index = -1 + + def _showStarred(self): + self.unread_articles = self.app.tinyTinyRSS.getStarredFeeds() + self.index = -1 + + def reload_done(self): + self.setUnreadCount() + self.app.list.setItems(self.unread_articles) + + def showIndex(self, index): + if self.index > -1: + previous = self.unread_articles[self.index] + if not "set_unread" in previous or not previous["set_unread"]: + self.app.tinyTinyRSS.setArticleRead(previous["id"]) + previous["unread"] = False + else: + previous["set_unread"] = False + + self.app.list.updateRead() + + self.index = index + current = self.unread_articles[self.index] + self.setArticle(current) + self.setUnreadCount() + + def showNext(self): + if self.index + 1 < len(self.unread_articles): + self.app.list.selectRow(self.index + 1) + + def showPrevious(self): + if self.index > 0: + self.app.list.selectRow(self.index - 1) + + def openCurrent(self): + current = self.unread_articles[self.index] + url = QtCore.QUrl(current["link"]) + self.openLink(url) + + def setArticle(self, article): + func = u"setArticle({});".format(json.dumps(article)) + self.evaluateJavaScript(func) + + def evaluateJavaScript(self, func): + return self.wb.page().mainFrame().evaluateJavaScript(func) + + def setUnreadCount(self): + length = len(self.unread_articles) + i = 0 + if self.index > 0: + i = self.index + unread = length - i + + self.app.setWindowTitle(" (" + str(unread) + "/" + str(length) + ")") + if unread < 1: + self.evaluateJavaScript("setArticle('empty')") + + def templateString(self): + html=""" + + + + + ttrssl + + + + +
+

+

+

+
+
+ + """ + return html + + + +class TinyTinyRSS: + def __init__(self, app, server_url, session_id): + self.app = app + if server_url and session_id: + self.server_url = server_url + self.session_id = session_id + else: + self.app.authenticate() + + def doOperation(self, operation, options=None): + url = self.server_url + "/api/" + default_options = {'sid': self.session_id, 'op': operation} + if options: + options = dict(default_options.items() + options.items()) + else: + options = default_options + json_string = json.dumps(options) + req = urllib2.Request(url) + fd = urllib2.urlopen(req, json_string) + body = "" + while True: + data = fd.read(1024) + if not len(data): + break + body += data + + return json.loads(body)["content"] + + def getUnreadFeeds(self, view_mode="unread"): + unread_articles = [] + def more(skip): + return self.doOperation("getHeadlines", {"show_excerpt": False, "view_mode": view_mode, "show_content": True, "feed_id": -4, "skip": skip}) + + skip = 0 + while True: + new = more( skip) + unread_articles += new + length = len(new) + + if length < 1: + break + skip += length + + return unread_articles + + def getStarredFeeds(self): + return self.getUnreadFeeds("marked") + + def setArticleRead(self, article_id, read=True): + self.updateArticle(article_id, 2, not read) + + def setArticleStarred(self, article_id, starred=True): + self.updateArticle(article_id, 0, starred) + + def updateArticle(self, article_id, field, true=True): + l = lambda: self.doOperation("updateArticle", {'article_ids':article_id, 'mode': 1 if true else 0, 'field': field}) + t = Thread(target=l) + t.start() + + def logOut(self): + self.doOperation("logout") + + @classmethod + def login(self, server_url, user, password): + url = server_url + "/api/" + options = {"op": "login", "user": user, "password": password} + json_string = json.dumps(options) + req = urllib2.Request(url) + fd = urllib2.urlopen(req, json_string) + body = "" + while 1: + data = fd.read(1024) + if not len(data): + break + body += data + + body = json.loads(body)["content"] + + if body.has_key("error"): + msgBox = QtGui.QMessageBox() + msgBox.setText(body["error"]) + msgBox.exec_() + return None + + return body["session_id"] + + +class Login(QtGui.QDialog): + def __init__(self): + QtGui.QDialog.__init__(self) + self.setWindowIcon(QtGui.QIcon("feedmonkey.png")) + self.setWindowTitle("Feed the Monkey - Login") + + self.label = QtGui.QLabel(self) + self.label.setText("Please specify a server url, a username and a password.") + + self.textServerUrl = QtGui.QLineEdit(self) + self.textServerUrl.setPlaceholderText("http://example.com/ttrss/") + self.textServerUrl.setText("http://") + + self.textName = QtGui.QLineEdit(self) + self.textName.setPlaceholderText("username") + + self.textPass = QtGui.QLineEdit(self) + self.textPass.setEchoMode(QtGui.QLineEdit.Password); + self.textPass.setPlaceholderText("password") + + self.buttons = QtGui.QDialogButtonBox(QtGui.QDialogButtonBox.Ok) + self.buttons.accepted.connect(self.accept) + + layout = QtGui.QVBoxLayout(self) + layout.addWidget(self.label) + layout.addWidget(self.textServerUrl) + layout.addWidget(self.textName) + layout.addWidget(self.textPass) + layout.addWidget(self.buttons) + + +class WorkerThread(QtCore.QThread): + + def __init__(self, parent, do_reload): + super(WorkerThread, self).__init__(parent) + self.do_reload = do_reload + + def run(self): + self.do_reload() + self.emit(QtCore.SIGNAL("reload_done()")) + + +if __name__ == "__main__": + app = QtGui.QApplication(sys.argv) + wb = MainWindow() + wb.show() + sys.exit(app.exec_()) diff --git a/misc/feedthemonkey.desktop b/feedthemonkey.desktop similarity index 78% rename from misc/feedthemonkey.desktop rename to feedthemonkey.desktop index c302345..e526644 100644 --- a/misc/feedthemonkey.desktop +++ b/feedthemonkey.desktop @@ -1,11 +1,12 @@ [Desktop Entry] +Version=0.1.0 Comment=A desktop client for the TinyTinyRSS feed reader. Exec=feedthemonkey GenericName=Feed Reader Icon=feedthemonkey -Name=FeedTheMonkey +Name=Feed the Monkey NoDisplay=false StartupNotify=true Terminal=false Type=Application -Categories=Network;Qt; +Categories=Network;Qt diff --git a/misc/feedthemonkey.xpm b/feedthemonkey.xpm similarity index 100% rename from misc/feedthemonkey.xpm rename to feedthemonkey.xpm diff --git a/html/content.css b/html/content.css deleted file mode 100644 index 2b1d0b3..0000000 --- a/html/content.css +++ /dev/null @@ -1,112 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -html, body { - margin: 0; - padding: 0; -} - -body { - background: #eee; - font-family: sans-serif; - word-wrap: break-word; -} - -.nightmode { - background: #353535; - color: #ddd; -} - -.nightmode::-webkit-scrollbar { - width: 8px; - height: 8px; -} - -.nightmode::-webkit-scrollbar-track-piece { - background-color: #111; -} - -.nightmode::-webkit-scrollbar-thumb:vertical { - height: 30px; - background-color: #444; - border-radius: 5px; -} - -h1 { - font-size: 1.4em; - margin: 0; - padding: 0; -} - -.starred:after { - content: "*"; -} - -header { - padding: 2em; - border-bottom: 1px solid #aaa; -} - -.nightmode header { - border-bottom-color: #222; -} - -header p { - color: #666; - margin: 0; - padding: 0; -} - -.nightmode header p { - color: #888; -} - -a { - color: inherit; - text-decoration: none; -} - -article { - line-height: 1.6; - margin: 2em; -} - -article a { - text-decoration: underline; -} - -blockquote { - font-style: italic; -} - -img { - max-width: 100%; - height: auto; -} - -div > a:only-child img, figure > a:only-child img, p > a:only-child img, -figure > img:only-child, div > img:only-child, p > img:only-child { - display: block; - margin: 1em auto; - float: none !important; -} - -pre { - overflow: auto; -} diff --git a/html/content.html b/html/content.html deleted file mode 100644 index 87d53aa..0000000 --- a/html/content.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - TTRSS - - - - - -
-

-

-

-
-
- - diff --git a/html/html.qrc b/html/html.qrc deleted file mode 100644 index c6cf166..0000000 --- a/html/html.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - content.css - content.html - - diff --git a/misc/misc.qrc b/misc/misc.qrc deleted file mode 100644 index 615a2a0..0000000 --- a/misc/misc.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - feedthemonkey.xpm - Icon.icns - feedthemonkey.desktop - - diff --git a/ports/arch/PKGBUILD b/ports/arch/PKGBUILD deleted file mode 100644 index 07c344b..0000000 --- a/ports/arch/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Jeena - -pkgname=feedthemonkey -_name=FeedTheMonkey -pkgver=2.2.0 -pkgrel=1 -pkgdesc="Desktop client for the TinyTinyRSS reader" -arch=('i686' 'x86_64') -url="http://jabs.nu/feedthemonkey" -license=('GPL3') -depends=('qt5-declarative' 'qt5-quick1' 'qt5-quickcontrols' 'qt5-webengine') -source=("https://github.com/jeena/${_name}/archive/v${pkgver}.tar.gz") -md5sums=('SKIP') - -build() { - cd "${_name}-$pkgver" - qmake-qt5 PREFIX=${pkgdir}/usr - make -} - -package() { - cd "${_name}-$pkgver" - make install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/ports/osx/deploy.sh b/ports/osx/deploy.sh deleted file mode 100755 index 369e2ec..0000000 --- a/ports/osx/deploy.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -# The macdeployqt app you get while installing Qt is broken for newer Qt -# versions like 5.4 which we use, we will have to replace it. -# -# Download and compile https://github.com/MaximAlien/macdeployqt do not -# use the .dmg which is too old. Move the new macdeployqt so it is in -# $QTDIR/bin/macdeployqt. -# -# Use fixqtlibspath.sh to fix your Qt installation, you need to change the -# path in this script, you don't have to run the Predator part. -# -# Build FeedTheMonkey.app in QtCreator as Release. - -if [[ "" == "$QTDIR" ]]; then - QTDIR=~/Qt/5.4/clang_64/ -fi - -BUILDDIR=$1 -APPDIR=$BUILDDIR/FeedTheMonkey.app -CONTENTSDIR=$APPDIR/Contents -ABSPATH=$(cd "$(dirname "$0")"; pwd) - -if [[ "" == "$BUILDDIR" ]]; then - echo "Usage: $0 path/to/build/" - exit 1 -fi - -# libexec -mkdir -p $APPDIR/Contents/libexec -cp $QTDIR/libexec/QtWebProcess $CONTENTSDIR/libexec -cat > $CONTENTSDIR/libexec/qt.conf << EOF -[Paths] -Plugins = ../PlugIns -Qml2Imports = ../Imports/qtquick2 -EOF - -# lab settings -mkdir -p $CONTENTSDIR/Imports/qtquick2/Qt/labs -cp -R $QTDIR/qml/Qt/labs/settings $CONTENTSDIR/Imports/qtquick2/Qt/labs -cat > $CONTENTSDIR/Resources/qt.conf << EOF -[Paths] -Plugins = PlugIns -Qml2Imports = Imports/qtquick2 -EOF - -# deploy -$QTDIR/bin/macdeployqt $APPDIR -no-strip -qmldir=$ABSPATH/../../qml -executable=$CONTENTSDIR/libexec/QtWebProcess - -open $BUILDDIR - diff --git a/qml/Content.qml b/qml/Content.qml deleted file mode 100644 index 07440be..0000000 --- a/qml/Content.qml +++ /dev/null @@ -1,116 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -import QtWebEngine 1.8 -import QtQuick 2.0 -import QtQuick.Controls 1.3 -import QtQuick.Layouts 1.1 -import QtQuick.Controls.Styles 1.3 -import TTRSS 1.0 - -Item { - id: content - property Post post - property ApplicationWindow app - - property int textFontSize: 14 - property bool nightmode - property int scrollJump: 48 - property int pageJump: parent.height - Layout.minimumWidth: 400 - onTextFontSizeChanged: webView.setDefaults() - onNightmodeChanged: webView.setDefaults() - - function scrollDown(jump) { - if(!jump) { - webView.runJavaScript("window.scrollTo(0, document.body.scrollHeight - " + height + ");") - } else { - webView.runJavaScript("window.scrollBy(0, " + jump + ");") - } - } - - function scrollUp(jump) { - if(!jump) { - webView.runJavaScript("window.scrollTo(0, 0);") - } else { - webView.runJavaScript("window.scrollBy(0, -" + jump + ");") - } - } - - function loggedOut() { - post = null - } - - Label { id: fontLabel } - - WebEngineView { - id: webView - anchors.fill: parent - url: "../html/content.html" - - property Post post: content.post - - function setPost() { - if(post) { - webView.runJavaScript("setArticle(" + post.jsonString + ")") - } else { - webView.runJavaScript("setArticle('logout')") - } - } - - function setDefaults() { - // font name needs to be enclosed in single quotes - // and this is needed for El Capitain because ".SF NS Text" won't work - var defFont = ", system, -apple-system, '.SFNSDisplay-Regular', 'Helvetica Neue', 'Lucida Grande'"; - var font = "'" + fontLabel.font.family + "'" + defFont; - webView.runJavaScript("document.body.style.fontFamily = \"" + font + "\";"); - webView.runJavaScript("document.body.style.fontSize = '" + content.textFontSize + "pt';"); - webView.runJavaScript("if(typeof setNightmode == \"function\") setNightmode(" + (content.nightmode ? "true" : "false") + ")") - } - - onNavigationRequested: { - if (request.url == "feedthemonkey:previous") { - request.action = WebEngineView.IgnoreRequest; - app.showPreviousPost(); - } else if (request.url == "feedthemonkey:next") { - request.action = WebEngineView.IgnoreRequest; - app.showNextPost(); - } else if (request.url == "feedthemonkey:open") { - request.action = WebEngineView.IgnoreRequest; - Qt.openUrlExternally(post.link) - } else if (request.navigationType !== WebEngineNavigationRequest.LinkClickedNavigation) { - request.action = WebEngineView.AcceptRequest; - } else { - request.action = WebEngineView.IgnoreRequest; - Qt.openUrlExternally(request.url); - } - } - - onLoadingChanged: { - if(!loading) { - setPost() - setDefaults() - } - } - - onPostChanged: setPost() - Keys.onPressed: app.keyPressed(event) - } -} - diff --git a/qml/Login.qml b/qml/Login.qml deleted file mode 100644 index 5948a12..0000000 --- a/qml/Login.qml +++ /dev/null @@ -1,84 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -import QtQuick 2.0 -import QtQuick.Controls 1.2 - -Rectangle { - color: "transparent" - anchors.fill: parent - - property string serverUrl: serverUrl.text - property string userName: userName.text - property string password: password.text - - Column { - anchors.centerIn: parent - width: parent.width / 2 - anchors.margins: parent.width / 4 - spacing: 10 - - Text { - text: qsTr("Please specify a server url, a username and a password.") - wrapMode: Text.WordWrap - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 20 - font.pointSize: 20 - } - - TextField { - id: serverUrl - placeholderText: "http://example.com/ttrss/" - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 20 - validator: RegExpValidator { regExp: /https?:\/\/.+/ } - onAccepted: login() - } - - TextField { - id: userName - placeholderText: qsTr("username") - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 20 - onAccepted: login() - } - - TextField { - id: password - placeholderText: qsTr("password") - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 20 - echoMode: TextInput.Password - onAccepted: login() - } - - Button { - id: loginButton - text: "Ok" - anchors.right: parent.right - anchors.margins: 20 - onClicked: login() - } - } - -} diff --git a/qml/PostListItem.qml b/qml/PostListItem.qml deleted file mode 100644 index 63bf813..0000000 --- a/qml/PostListItem.qml +++ /dev/null @@ -1,123 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -import QtQuick 2.0 -import QtQuick.Controls 1.3 - -Item { - property int textFontSize: 14 - property int smallfontSize: 11 - property bool nightmode - - Component.onCompleted: fixFontSize() - onTextFontSizeChanged: fixFontSize() - - function fixFontSize() { - smallfontSize = textFontSize * 0.8 - } - - id: item - height: d.height + t.height + e.height + 2 - - Item { - anchors.fill: parent - - Item { - anchors.fill: parent - anchors.leftMargin: 15 - anchors.rightMargin: 15 - anchors.topMargin: 10 - anchors.bottomMargin: 10 - - Column { - id: column - width: parent.width - - Item { - width: parent.width - height: d.height - - Label { - text: feedTitle - font.pointSize: smallfontSize - textFormat: Text.PlainText - color: nightmode ? "#888" : "gray" - wrapMode: Text.WrapAnywhere - renderType: Text.NativeRendering - elide: Text.ElideLeft - anchors.top: parent.top - anchors.left: parent.left - anchors.right: d.left - maximumLineCount: 1 - } - Label { - id: d - text: date.toLocaleString(Qt.locale(), Locale.ShortFormat) - font.pointSize: smallfontSize - textFormat: Text.PlainText - color: nightmode ? "#888" : "gray" - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - renderType: Text.NativeRendering - anchors.right: parent.right - anchors.top: parent.top - } - } - Label { - id: t - text: title - color: nightmode ? (read ? "#888" : "#ddd") : (read ? "gray" : "black") - font.pointSize: textFontSize - textFormat: Text.PlainText - wrapMode: Text.WrapAnywhere - renderType: Text.NativeRendering - width: parent.width - elide: Text.ElideRight - maximumLineCount: 1 - - } - Label { - id: e - text: excerpt - font.pointSize: smallfontSize - //textFormat: Text.RichText - color: nightmode ? "#888" : "gray" - wrapMode: Text.WrapAnywhere - renderType: Text.NativeRendering - width: parent.width - elide: Text.ElideRight - maximumLineCount: 1 - } - } - } - - Rectangle { - anchors.top: parent.bottom - width: parent.width - height: 1 - color: nightmode ? "#222" : "lightgray" - } - } - - MouseArea { - anchors.fill: parent - onClicked: { - parent.parent.parent.currentIndex = index - } - } -} diff --git a/qml/Sidebar.qml b/qml/Sidebar.qml deleted file mode 100644 index 84de4cb..0000000 --- a/qml/Sidebar.qml +++ /dev/null @@ -1,106 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -import QtQuick 2.0 -import TTRSS 1.0 -import QtQuick.Controls 1.3 -import QtQuick.Layouts 1.1 -import QtQuick.Controls.Styles 1.3 - -ScrollView { - id: item - - property Server server - property Content content - property Post previousPost - property int textFontSize: 14 - property bool nightmode - - style: ScrollViewStyle { - transientScrollBars: true - } - - function next() { - if(listView.count > listView.currentIndex) { - listView.currentIndex++; - } - } - - function previous() { - if(listView.currentIndex > 0) { - listView.currentIndex--; - } - } - - onWidthChanged: { - // Hide sidebar if smaller than 200px wide - if(width < 200) { - width = 0; - } - } - - Rectangle { - width: 1 - color: app.nightmode ? "#111" : "lightgray" - anchors.right: parent.right - anchors.top: parent.top - height: parent.height - } - - ListView { - id: listView - - focus: true - anchors.fill: parent - spacing: 1 - model: item.server.posts - - delegate: Component { - PostListItem { - textFontSize: item.textFontSize - nightmode: app.nightmode - width: listView.width - } - } - - highlightFollowsCurrentItem: false - highlight: Component { - Rectangle { - width: listView.currentItem.width -1 - height: listView.currentItem.height - color: nightmode ? "#15539e" : "lightblue" - y: listView.currentItem.y - } - - } - - onCurrentItemChanged: { - if(previousPost) { - if(!previousPost.dontChangeRead) { - previousPost.read = true; - } else { - previousPost.dontChangeRead = false; - } - } - - item.content.post = server.posts[currentIndex] - previousPost = item.content.post - } - } -} diff --git a/qml/TheMenuBar.qml b/qml/TheMenuBar.qml deleted file mode 100644 index 34c0310..0000000 --- a/qml/TheMenuBar.qml +++ /dev/null @@ -1,144 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -import QtQuick.Controls 1.2 -import QtQuick.Window 2.0 -import QtQuick 2.0 -import TTRSS 1.0 - -MenuBar { - id: menuBar - property bool loggedIn: false - property ServerLogin serverLogin - property Server server - property Sidebar sidebar - property Content content - property bool visible: true - property var oldVisibility - - Menu { - visible: menuBar.visible - title: qsTr("File") - MenuItem { - text: qsTr("Close &Window") - shortcut: "Ctrl+W" - onTriggered: Qt.quit() - } - MenuItem { - text: qsTr("Exit") - shortcut: "Ctrl+Q" - onTriggered: Qt.quit() - } - } - - Menu { - visible: menuBar.visible - title: qsTr("Action") - MenuItem { - text: qsTr("Reload") - shortcut: "R" - enabled: loggedIn - onTriggered: server.reload() - } - MenuItem { - text: qsTr("Set &Unread") - shortcut: "U" - enabled: loggedIn - onTriggered: { - content.post.dontChangeRead = true - content.post.read = false - } - } - MenuItem { - text: qsTr("Next") - shortcut: "J" - enabled: loggedIn - onTriggered: sidebar.next() - } - MenuItem { - text: qsTr("Previous") - shortcut: "K" - enabled: loggedIn - onTriggered: sidebar.previous() - } - MenuItem { - text: qsTr("Open in Browser") - shortcut: "N" - enabled: loggedIn - onTriggered: Qt.openUrlExternally(content.post.link) - } - MenuItem { - text: qsTr("Log Out") - enabled: loggedIn - onTriggered: serverLogin.logout() - } - } - - Menu { - visible: menuBar.visible - title: qsTr("View") - MenuItem { - text: qsTr("Night mode") - shortcut: "1" - onTriggered: app.toggleNightmode() - } - MenuItem { - text: qsTr("Zoom In") - shortcut: "Ctrl++" - enabled: loggedIn - onTriggered: app.zoomIn() - } - MenuItem { - text: qsTr("Zoom Out") - shortcut: "Ctrl+-" - enabled: loggedIn - onTriggered: app.zoomOut() - } - MenuItem { - text: qsTr("Reset") - shortcut: "Ctrl+0" - enabled: loggedIn - onTriggered: app.zoomReset() - } - MenuItem { - text: qsTr("Fullscreen") - shortcut: "F11" - enabled: loggedIn - onTriggered: { - if(app.visibility == Window.FullScreen) { - app.visibility = oldVisibility - } else { - oldVisibility = app.visibility - app.showFullScreen() - } - - } - } - } - - Menu { - visible: menuBar.visible - title: qsTr("Help") - MenuItem { - text: qsTr("About") - onTriggered: Qt.openUrlExternally("http://jeena.net/feedthemonkey/index.html"); - } - } - -} diff --git a/qml/main.qml b/qml/main.qml deleted file mode 100644 index 0b6074b..0000000 --- a/qml/main.qml +++ /dev/null @@ -1,254 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -import QtQuick 2.3 -import QtQuick.Controls 1.3 -import QtQuick.Window 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Dialogs 1.1 -import Qt.labs.settings 1.0 -import TTRSS 1.0 - -ApplicationWindow { - id: app - title: "FeedTheMonkey" - visible: true - color: nightmode ? "#2d2d2d" : "#eee" - - minimumWidth: 480 - minimumHeight: 320 - - width: 800 - height: 640 - x: 200 - y: 200 - - property Server server: server - property Sidebar sidebar: sidebar - property Content content: content - - property variant fontSizes: [7,9,11,13,15,17,19,21,23,25,27,29,31] - property int defaultTextFontSizeIndex: 3 - property int textFontSizeIndex: defaultTextFontSizeIndex - property int textFontSize: fontSizes[textFontSizeIndex] - property bool nightmode: false - property bool showMenuBar: false - - menuBar: TheMenuBar { - id: menu - serverLogin: serverLogin - server: server - sidebar: sidebar - content: content - visible: app.showMenuBar - __contentItem.visible: visible - } - - Settings { - id: settings - category: "window" - property alias x: app.x - property alias y: app.y - property alias width: app.width - property alias height: app.height - property alias sidebarWidth: sidebar.width - property alias textFontSizeIndex: app.textFontSizeIndex - property alias nightmode: app.nightmode - } - - function loggedIn() { - if(serverLogin.loggedIn()) { - menu.loggedIn = true; - contentView.visible = true - login.visible = false; - server.initialize(serverLogin.serverUrl, serverLogin.sessionId); - } else { - menu.loggedIn = false - contentView.visible = false - login.visible = true - server.loggedOut() - content.loggedOut() - } - } - - function toggleNightmode() { - app.nightmode = !app.nightmode - } - - function zoomIn() { - if(textFontSizeIndex + 1 < fontSizes.length) { - textFontSize = fontSizes[++textFontSizeIndex] - } - } - - function zoomOut() { - if(textFontSizeIndex - 1 > 0) { - textFontSize = fontSizes[--textFontSizeIndex] - } - } - - function zoomReset() { - textFontSizeIndex = defaultTextFontSizeIndex - textFontSize = fontSizes[textFontSizeIndex] - } - - function removeHTML(str) { - forEscapingHTML.text = str - return forEscapingHTML.getText(0, forEscapingHTML.length) - } - - function showNextPost() { - sidebar.next() - } - - function showPreviousPost() { - sidebar.previous() - } - - function keyPressed(event) { - switch (event.key) { - case Qt.Key_Right: - case Qt.Key_J: - case Qt.Key_j: - sidebar.next() - break - case Qt.Key_Left: - case Qt.Key_K: - case Qt.Key_k: - sidebar.previous() - break - case Qt.Key_1: - toggleNightmode() - break - case Qt.Key_Home: - content.scrollUp() - break - case Qt.Key_End: - content.scrollDown() - break - case Qt.Key_PageUp: - content.scrollUp(content.pageJump) - break - case Qt.Key_PageDown: - case Qt.Key_Space: - content.scrollDown(content.pageJump) - break - case Qt.Key_Down: - content.scrollDown(content.scrollJump) - break - case Qt.Key_Up: - content.scrollUp(content.scrollJump) - break - case Qt.Key_Enter: - case Qt.Key_Return: - Qt.openUrlExternally(content.post.link) - break - default: - break - } - } - - SplitView { - id: contentView - anchors.fill: parent - orientation: Qt.Horizontal - visible: serverLogin.loggedIn() - focus: true - handleDelegate: Rectangle { - width: 1 - color: app.nightmode ? "#333" : "#aaa" - } - - Sidebar { - id: sidebar - content: content - server: server - - implicitWidth: 300 - textFontSize: app.textFontSize - nightmode: app.nightmode - } - - Content { - id: content - app: app - - Layout.minimumWidth: 200 - implicitWidth: 624 - textFontSize: app.textFontSize - nightmode: app.nightmode - } - - Keys.onPressed: keyPressed(event) - Keys.onReleased: { - switch (event.key) { - case Qt.Key_Alt: - app.showMenuBar = !app.showMenuBar - break - default: - break - } - } - } - - Login { - id: login - anchors.fill: parent - visible: !serverLogin.loggedIn() - - function login() { - serverLogin.login(serverUrl, userName, password) - } - - } - - MessageDialog { - id: loginErrorAlert - title: "A login error occured" - text: serverLogin.loginError - onAccepted: visible = false - } - - ServerLogin { - id: serverLogin - onSessionIdChanged: app.loggedIn() - onLoginErrorChanged: { - console.log("loginError:", loginError) - if(loginError.length > 0) { - loginErrorAlert.visible = true - } - } - } - - Server { - id: server - } - - TextArea { - id: forEscapingHTML - visible: false - textFormat: TextEdit.RichText - } - - Component.onCompleted: { - if(serverLogin.loggedIn()) { - loggedIn(); - } - } -} diff --git a/qml/qml.qrc b/qml/qml.qrc deleted file mode 100644 index c0ff3c6..0000000 --- a/qml/qml.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - main.qml - TheMenuBar.qml - Content.qml - Login.qml - PostListItem.qml - Sidebar.qml - - diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..1f371db --- /dev/null +++ b/setup.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python2 + +import os, PyQt4 +from setuptools import setup +from sys import platform as _platform + +VERSION = "0.1.2" + +files = [] +options = {} +setup_requires = [] + +is_osx = _platform == "darwin" +is_win = os.name == "nt" +is_linux = not is_osx and not is_win + +if is_linux: + setup( + name = "FeedTheMonkey", + version = VERSION, + author = "Jeena Paradies", + author_email = "spam@jeenaparadies.net", + url = "http://jabs.nu/feedthemonkey", + license = "BSD license", + scripts = ["feedthemonkey"], + data_files=[ + ('/usr/share/applications', ["feedthemonkey.desktop"]), + ('/usr/share/pixmaps', ["feedthemonkey.xpm"]) + ] + ) + +if is_osx: + options = { + 'py2app': { + 'argv_emulation': False, + 'iconfile': 'Icon.icns', + 'plist': { + 'CFBundleShortVersionString': VERSION, + 'CFBundleIdentifier': "nu.jabs.apps.feedthemonkey", + 'LSMinimumSystemVersion': "10.4", + 'CFBundleURLTypes': [ + { + 'CFBundleURLName': 'nu.jabs.apps.feedthemonkey.handler', + 'CFBundleURLSchemes': ['feedthemonkey'] + } + ] + }, + 'includes':['PyQt4.QtWebKit', 'PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtNetwork'], + 'excludes': ['PyQt4.QtDesigner', 'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtSql', 'PyQt4.QtTest', 'PyQt4.QtXml', 'PyQt4.phonon', 'simplejson'], + 'qt_plugins': 'imageformats', + } + } + + setup_requires = ["py2app"] + APP = ["feedthemonkey"] + + for dirname, dirnames, filenames in os.walk('.'): + for filename in filenames: + if filename == "Icon.icns": + files += [(dirname, [os.path.join(dirname, filename)])] + + setup( + app = APP, + name = "FeedTheMonkey", + options = options, + version = VERSION, + author = "Jeena Paradies", + author_email = "spam@jeenaparadies.net", + url = "http://jabs.nu/feedthemonkey", + license = "BSD license", + scripts = ["feedthemonkey"], + data_files = files, + setup_requires = setup_requires + ) diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index 95f351e..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "tinytinyrsslogin.h" -#include "tinytinyrss.h" -#include "post.h" - -int main(int argc, char *argv[]) -{ - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication app(argc, argv); - app.setOrganizationName("Jeena"); - app.setOrganizationDomain("jeena.net"); - app.setApplicationName("FeedTheMonkey"); - - QtWebEngine::initialize(); - - qmlRegisterType("TTRSS", 1, 0, "ServerLogin"); - qmlRegisterType("TTRSS", 1, 0, "Server"); - qmlRegisterType("TTRSS", 1, 0, "Post"); - - QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml"))); - - return app.exec(); -} diff --git a/src/post.cpp b/src/post.cpp deleted file mode 100644 index 2d3179b..0000000 --- a/src/post.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -#include "post.h" -#include -#include -#include - -Post::Post(QObject *parent) : QObject(parent) -{ - -} - -Post::Post(QJsonObject post, QObject *parent) : QObject(parent) -{ - mTitle = html2text(post.value("title").toString().trimmed()); - mFeedTitle = html2text(post.value("feed_title").toString().trimmed()); - mId = post.value("id").toInt(); - mFeedId = post.value("feed_id").toString().trimmed(); - mAuthor = post.value("author").toString().trimmed(); - QUrl url(post.value("link").toString().trimmed()); - mLink = url; - QDateTime timestamp; - timestamp.setTime_t(post.value("updated").toInt()); - mDate = timestamp; - mContent = post.value("content").toString().trimmed(); - mExcerpt = html2text(post.value("excerpt").toString().remove(QRegExp("<[^>]*>")).replace("…", " ...").trimmed().replace("(\\s+)", " ").replace("\n", "")); - mStarred = post.value("marked").toBool(); - mRead = !post.value("unread").toBool(); - mDontChangeRead = false; - - QJsonDocument doc(post); - QString result(doc.toJson(QJsonDocument::Indented)); - mJsonString = result; -} - -Post::~Post() -{ - -} - -void Post::setRead(bool r) -{ - if(mRead == r) return; - - mRead = r; - emit readChanged(mRead); -} - -void Post::setDontChangeRead(bool r) -{ - if(mDontChangeRead == r) return; - - mDontChangeRead = r; - emit dontChangeReadChanged(mDontChangeRead); -} - -QString Post::html2text(const QString htmlString) -{ - QTextDocument doc; - doc.setHtml(htmlString); - return doc.toPlainText(); -} diff --git a/src/post.h b/src/post.h deleted file mode 100644 index 56ab9ff..0000000 --- a/src/post.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -#ifndef POST_H -#define POST_H - -#include -#include -#include -#include - -class Post : public QObject -{ - Q_OBJECT - Q_PROPERTY(QString title READ title CONSTANT) - Q_PROPERTY(QString feedTitle READ feedTitle CONSTANT) - Q_PROPERTY(int id READ id CONSTANT) - Q_PROPERTY(QString feedId READ feedId CONSTANT) - Q_PROPERTY(QString author READ author CONSTANT) - Q_PROPERTY(QUrl link READ link CONSTANT) - Q_PROPERTY(QDateTime date READ date CONSTANT) - Q_PROPERTY(QString content READ content CONSTANT) - Q_PROPERTY(QString excerpt READ excerpt CONSTANT) - Q_PROPERTY(bool starred READ starred NOTIFY starredChanged) - Q_PROPERTY(bool read READ read WRITE setRead NOTIFY readChanged) - Q_PROPERTY(bool dontChangeRead READ dontChangeRead WRITE setDontChangeRead NOTIFY dontChangeReadChanged) - Q_PROPERTY(QString jsonString READ jsonString CONSTANT) - -public: - Post(QObject *parent = 0); - Post(QJsonObject post, QObject *parent = 0); - ~Post(); - QString title() const { return mTitle; } - QString feedTitle() const { return mFeedTitle; } - int id() const { return mId; } - QString feedId() const { return mFeedId; } - QString author() const { return mAuthor; } - QUrl link() const { return mLink; } - QDateTime date() const { return mDate; } - QString content() const { return mContent; } - QString excerpt() const { return mExcerpt; } - bool starred() const { return mStarred; } - bool read() { return mRead; } - void setRead(bool r); - bool dontChangeRead() const { return mDontChangeRead; } - void setDontChangeRead(bool r); - QString jsonString() const { return mJsonString; } - -signals: - void starredChanged(bool); - void readChanged(bool); - void dontChangeReadChanged(bool); - -public slots: - -private: - QString mTitle; - QString mFeedTitle; - int mId; - QString mFeedId; - QString mAuthor; - QUrl mLink; - QDateTime mDate; - QString mContent; - QString mExcerpt; - bool mStarred; - bool mRead; - bool mDontChangeRead; - QString mJsonString; - QString html2text(const QString htmlString); -}; - -#endif // POST_H diff --git a/src/tinytinyrss.cpp b/src/tinytinyrss.cpp deleted file mode 100644 index 4806c04..0000000 --- a/src/tinytinyrss.cpp +++ /dev/null @@ -1,150 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -#include "tinytinyrss.h" -#include -#include -#include -#include - -TinyTinyRSS::TinyTinyRSS(QObject *parent) : - QObject(parent) -{ - qRegisterMetaType >(); - - mNetworkManager = new QNetworkAccessManager(this); - mPosts = QList(); -} - -TinyTinyRSS::~TinyTinyRSS() -{ - mPosts.clear(); - delete mNetworkManager; -} - -void TinyTinyRSS::initialize(const QString serverUrl, const QString sessionId) -{ - mServerUrl = serverUrl; - mSessionId = sessionId; - reload(); -} - -void TinyTinyRSS::reload() -{ - QVariantMap opts; - opts.insert("show_excerpt", false); - opts.insert("view_mode", "unread"); - opts.insert("show_content", true); - opts.insert("feed_id", -4); - opts.insert("skip", 0); - - doOperation("getHeadlines", opts, [this] (const QJsonObject &json) { - - mPosts.clear(); - - QJsonArray posts = json.value("content").toArray(); - for(int i = 0; i < posts.count(); i++) - { - QJsonObject postJson = posts.at(i).toObject(); - Post *post = new Post(postJson, this); - connect(post, SIGNAL(readChanged(bool)), this, SLOT(onPostReadChanged(bool))); - mPosts.append(post); - } - - emit postsChanged(mPosts); - }); -} - -void TinyTinyRSS::loggedOut() -{ - mServerUrl = nullptr; - mSessionId = nullptr; - mPosts.clear(); - emit postsChanged(mPosts); -} - -void TinyTinyRSS::doOperation(QString operation, QVariantMap opts, std::function callback) -{ - QVariantMap options; - options.insert("sid", mSessionId); - options.insert("op", operation); - - QMapIterator i(opts); - while (i.hasNext()) { - i.next(); - options.insert(i.key(), i.value()); - } - - QJsonObject jsonobj = QJsonObject::fromVariantMap(options); - QJsonDocument json = QJsonDocument(jsonobj); - - QNetworkRequest request(mServerUrl); - request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - - QNetworkReply *reply = mNetworkManager->post(request, json.toJson()); - - connect(reply, &QNetworkReply::finished, [callback, reply] () { - if (reply) { - if (reply->error() == QNetworkReply::NoError) { - QString jsonString = QString(reply->readAll()); - QJsonDocument json = QJsonDocument::fromJson(jsonString.toUtf8()); - callback(json.object()); - } else { - int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - //do some error management - qWarning() << "HTTP error: " << httpStatus; - } - reply->deleteLater(); - } - }); -} - -void TinyTinyRSS::onPostReadChanged(bool r) -{ - Post *post = (Post *)sender(); - - updateArticle(post->id(), 2, !r, [post] (const QJsonObject &) { - // not doing anything with this yet. - }); -} - -void TinyTinyRSS::updateArticle(int articleId, int field, bool trueFalse, std::function callback) -{ - QVariantMap opts; - opts.insert("article_ids", articleId); - opts.insert("field", field); - opts.insert("mode", trueFalse ? 1 : 0); - - doOperation("updateArticle", opts, callback); -} - -QQmlListProperty TinyTinyRSS::posts() -{ - return QQmlListProperty(this, mPosts); -} - -int TinyTinyRSS::postsCount() const -{ - return mPosts.count(); -} - -Post *TinyTinyRSS::post(int index) const -{ - return mPosts.at(index); -} diff --git a/src/tinytinyrss.h b/src/tinytinyrss.h deleted file mode 100644 index 2e85464..0000000 --- a/src/tinytinyrss.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -#ifndef TINYTINYRSS_H -#define TINYTINYRSS_H - -#include -#include -#include -#include -#include -#include - -#include - -#include "post.h" - -class TinyTinyRSS : public QObject -{ - Q_OBJECT - Q_PROPERTY(QQmlListProperty posts READ posts NOTIFY postsChanged) - -public: - TinyTinyRSS(QObject *parent = 0); - ~TinyTinyRSS(); - - Q_INVOKABLE void initialize(const QString serverUrl, const QString sessionId); - Q_INVOKABLE void reload(); - Q_INVOKABLE void loggedOut(); - - - QQmlListProperty posts(); - int postsCount() const; - Post *post(int) const; - -signals: - void postsChanged(QList); - -private slots: - void onPostReadChanged(bool); - -private: - void doOperation(QString operation, QVariantMap opts, std::function callback); - void updateArticle(int articleId, int field, bool trueFalse, std::function callback); - - QString mServerUrl; - QString mSessionId; - QList mPosts; - QNetworkAccessManager *mNetworkManager; -}; - -#endif // TINYTINYRSS_H diff --git a/src/tinytinyrsslogin.cpp b/src/tinytinyrsslogin.cpp deleted file mode 100644 index 2648e7a..0000000 --- a/src/tinytinyrsslogin.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -#include "tinytinyrsslogin.h" -#include -#include -#include -#include - -#define APP_URL "net.jeena" -#define APP_NAME "FeedTheMonkey" - -TinyTinyRSSLogin::TinyTinyRSSLogin(QObject *parent) : - QObject(parent) -{ - mNetworkManager = new QNetworkAccessManager(this); - - QSettings settings; - mSessionId = settings.value("sessionId").toString(); - mServerUrl = settings.value("serverUrl").toString(); -} - -TinyTinyRSSLogin::~TinyTinyRSSLogin() -{ - delete mNetworkManager; -} - -bool TinyTinyRSSLogin::loggedIn() -{ - return !mSessionId.isEmpty(); -} - -void TinyTinyRSSLogin::login(const QString serverUrl, const QString user, const QString password) -{ - mServerUrl = QUrl(serverUrl + "/api/"); - - QVariantMap options; - options.insert("op", "login"); - options.insert("user", user); - options.insert("password", password); - - QJsonObject jsonobj = QJsonObject::fromVariantMap(options); - QJsonDocument json = QJsonDocument(jsonobj); - - QNetworkRequest request(mServerUrl); - request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - - QNetworkReply *reply = mNetworkManager->post(request, json.toJson()); - connect(reply, SIGNAL(finished()), this, SLOT(reply())); -} - -void TinyTinyRSSLogin::logout() -{ - if(mSessionId.length() > 0 && mServerUrl.toString().length() > 0) { - QVariantMap options; - options.insert("op", "logout"); - options.insert("sid", mSessionId); - - QJsonObject jsonobj = QJsonObject::fromVariantMap(options); - QJsonDocument json = QJsonDocument(jsonobj); - - QNetworkRequest request(mServerUrl); - request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - - QNetworkReply *reply = mNetworkManager->post(request, json.toJson()); - connect(reply, SIGNAL(finished()), this, SLOT(reply())); - } -} - -void TinyTinyRSSLogin::reply() -{ - QNetworkReply *reply = qobject_cast(sender()); - - if (reply) { - - if (reply->error() == QNetworkReply::NoError) { - - QString jsonString = QString(reply->readAll()); - QJsonDocument json = QJsonDocument::fromJson(jsonString.toUtf8()); - if(json.object().value("content").toObject().value("error").toString().length() > 0) { - - mLoginError = json.object().value("content").toObject().value("error").toString(); - qWarning() << mLoginError; - emit loginErrorChanged(mLoginError); - - if(mLoginError == "NOT_LOGGED_IN") { - mSessionId = nullptr; - mServerUrl = nullptr; - - QSettings settings; - settings.remove("sessionId"); - settings.remove("serverUrl"); - settings.sync(); - - emit sessionIdChanged(mSessionId); - } - - } else { - mSessionId = json.object().value("content").toObject().value("session_id").toString(); - - emit sessionIdChanged(mSessionId); - - QSettings settings; - settings.setValue("sessionId", mSessionId); - settings.setValue("serverUrl", mServerUrl); - settings.sync(); - } - } else { - mLoginError = "HTTP error: " - + reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString() - + " :: " - + reply->errorString(); - qWarning() << mLoginError; - - emit loginErrorChanged(mLoginError); - } - reply->deleteLater(); - } -} diff --git a/src/tinytinyrsslogin.h b/src/tinytinyrsslogin.h deleted file mode 100644 index 5c21887..0000000 --- a/src/tinytinyrsslogin.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of FeedTheMonkey. - * - * Copyright 2015 Jeena - * - * FeedTheMonkey 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. - * - * FeedTheMonkey 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 FeedTheMonkey. If not, see . - */ - -#ifndef TINYTINYRSSLOGIN_H -#define TINYTINYRSSLOGIN_H - -#include -#include -#include -#include - -class TinyTinyRSSLogin : public QObject -{ - Q_OBJECT - Q_PROPERTY(QString sessionId READ sessionId NOTIFY sessionIdChanged) - Q_PROPERTY(QUrl serverUrl READ serverUrl) - Q_PROPERTY(QString loginError READ loginError NOTIFY loginErrorChanged) - -public: - TinyTinyRSSLogin(QObject *parent = 0); - ~TinyTinyRSSLogin(); - QString sessionId() const { return mSessionId; } - QUrl serverUrl() const { return mServerUrl; } - QString loginError() const { return mLoginError; } - - Q_INVOKABLE bool loggedIn(); - Q_INVOKABLE void login(const QString serverUrl, const QString user, const QString password); - Q_INVOKABLE void logout(); - -signals: - void sessionIdChanged(QString); - void loginErrorChanged(QString); - -private slots: - void reply(); - -private: - QString mSessionId; - QUrl mServerUrl; - QString mLoginError; - QNetworkAccessManager *mNetworkManager; -}; - -#endif // TINYTINYRSSLOGIN_H