commit 73c91e26e1aa3d375ef490b01085b0c03a71c777 Author: Grégory Oestreicher Date: Fri Dec 16 14:21:20 2016 +0100 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..75c107b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pro.user diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..7bbcfc9 --- /dev/null +++ b/COPYING @@ -0,0 +1,40 @@ +WallaRead - A Wallabag 2+ client for SailfishOS +© 2016 Grégory Oestreicher + +WallaRead 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. + +WallaRead 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 WallaRead. If not, see . + + +WallaRead uses graphical elements from Wallabag (https://www.wallabag.org/) +which are subject to the following license: + +Copyright (c) 2013-2016 Nicolas Lœuillet + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/LICENSE.gpl b/LICENSE.gpl new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE.gpl @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + 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/harbour-wallaread.desktop b/harbour-wallaread.desktop new file mode 100644 index 0000000..482205e --- /dev/null +++ b/harbour-wallaread.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +X-Nemo-Application-Type=silica-qt5 +Icon=harbour-wallaread +Exec=harbour-wallaread +Name=WallaRead diff --git a/harbour-wallaread.png b/harbour-wallaread.png new file mode 100644 index 0000000..669b000 Binary files /dev/null and b/harbour-wallaread.png differ diff --git a/harbour-wallaread.pro b/harbour-wallaread.pro new file mode 100644 index 0000000..654712e --- /dev/null +++ b/harbour-wallaread.pro @@ -0,0 +1,53 @@ +# NOTICE: +# +# Application name defined in TARGET has a corresponding QML filename. +# If name defined in TARGET is changed, the following needs to be done +# to match new name: +# - corresponding QML filename must be changed +# - desktop icon filename must be changed +# - desktop filename must be changed +# - icon definition filename in desktop file must be changed +# - translation filenames have to be changed + +# The name of your application +TARGET = harbour-wallaread + +CONFIG += sailfishapp c++11 + +SOURCES += src/harbour-wallaread.cpp \ + src/httprequester.cpp + +OTHER_FILES += qml/harbour-wallaread.qml \ + qml/cover/CoverPage.qml \ + rpm/harbour-wallaread.changes.in \ + rpm/harbour-wallaread.spec \ + rpm/harbour-wallaread.yaml \ + translations/*.ts \ + harbour-wallaread.desktop + +SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256 + +# to disable building translations every time, comment out the +# following CONFIG line +CONFIG += sailfishapp_i18n + +# German translation is enabled as an example. If you aren't +# planning to localize your app, remember to comment out the +# following TRANSLATIONS line. And also do not forget to +# modify the localized app name in the the .desktop file. +TRANSLATIONS += translations/harbour-wallaread-de.ts + +HEADERS += \ + src/httprequester.h + +DISTFILES += \ + qml/js/WallaBase.js \ + qml/models/ArticlesModel.qml \ + qml/models/ServersModel.qml \ + qml/pages/ArticlePage.qml \ + qml/pages/ServerPage.qml \ + qml/pages/ServerSettingsDialog.qml \ + qml/pages/ServersPage.qml \ + qml/pages/SettingsPage.qml \ + qml/types/Server.qml \ + qml/types/ServerSettings.qml diff --git a/icons/108x108/harbour-wallaread.png b/icons/108x108/harbour-wallaread.png new file mode 100644 index 0000000..c80b91c Binary files /dev/null and b/icons/108x108/harbour-wallaread.png differ diff --git a/icons/128x128/harbour-wallaread.png b/icons/128x128/harbour-wallaread.png new file mode 100644 index 0000000..d615f57 Binary files /dev/null and b/icons/128x128/harbour-wallaread.png differ diff --git a/icons/256x256/harbour-wallaread.png b/icons/256x256/harbour-wallaread.png new file mode 100644 index 0000000..c1c2e61 Binary files /dev/null and b/icons/256x256/harbour-wallaread.png differ diff --git a/icons/86x86/harbour-wallaread.png b/icons/86x86/harbour-wallaread.png new file mode 100644 index 0000000..669b000 Binary files /dev/null and b/icons/86x86/harbour-wallaread.png differ diff --git a/icons/icon.svg b/icons/icon.svg new file mode 100644 index 0000000..4d03ceb --- /dev/null +++ b/icons/icon.svg @@ -0,0 +1,119 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml new file mode 100644 index 0000000..ccaf3e6 --- /dev/null +++ b/qml/cover/CoverPage.qml @@ -0,0 +1,44 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +CoverBackground { + Label { + id: label + anchors.centerIn: parent + text: qsTr("My Cover") + } + + CoverActionList { + id: coverAction + + CoverAction { + iconSource: "image://theme/icon-cover-next" + } + + CoverAction { + iconSource: "image://theme/icon-cover-pause" + } + } +} + diff --git a/qml/harbour-wallaread.qml b/qml/harbour-wallaread.qml new file mode 100644 index 0000000..ff964d3 --- /dev/null +++ b/qml/harbour-wallaread.qml @@ -0,0 +1,32 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import "pages" + +ApplicationWindow +{ + initialPage: Component { ServersPage { } } + cover: Qt.resolvedUrl("cover/CoverPage.qml") + allowedOrientations: defaultAllowedOrientations +} + diff --git a/qml/js/WallaBase.js b/qml/js/WallaBase.js new file mode 100644 index 0000000..c09f49b --- /dev/null +++ b/qml/js/WallaBase.js @@ -0,0 +1,627 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +.pragma library +.import QtQuick.LocalStorage 2.0 as Storage + +/* + Exposed variable + */ + +var ArticlesFilter = { + All: 1, + Read: 2, + Starred: 4 +} + +/* + Servers management + */ + +function getServers( cb ) +{ + var db = getDatabase(); + + db.readTransaction( + function( tx ) { + var servers = new Array; + var err = null; + + try { + var res = tx.executeSql( "SELECT id, name FROM servers ORDER BY NAME" ); + for ( var i = 0; i < res.rows.length; ++i ) { + var current = res.rows.item( i ); + var server = { id: current.id, name: current.name, unread: 0 }; + var countRes = tx.executeSql( "SELECT COUNT(*) as count FROM articles WHERE server=? AND archived=0", [ current.id ] ); + server.unread = countRes.rows[0].count; + servers.push( server ); + } + } + catch( e ) { + err = e.message; + } + + cb( servers, err ); + } + ); +} + +function getServer( id, cb ) +{ + var err = null; + var db = getDatabase(); + + db.readTransaction( + function( tx ) { + var server = null; + try { + var res = tx.executeSql( "SELECT id, name, url, lastSync FROM servers WHERE id=?", [ id ] ); + if ( res.rows.length === 0 ) { + err = "No server with this ID found"; + } + else { + server = res.rows.item( 0 ); + } + } + catch( e ) { + err = e.message; + } + + cb( server, err ); + } + ); +} + +function getServerSettings( id, cb ) +{ + var err = null; + var db = getDatabase(); + + db.readTransaction( + function( tx ) { + var server = null; + try { + var res = tx.executeSql( "SELECT * FROM servers WHERE id=?", [ id ] ); + if ( res.rows.length === 0 ) { + err = "No server with this ID found"; + } + else { + server = res.rows.item( 0 ); + } + } + catch( e ) { + err = e.message; + } + + cb( server, err ); + } + ); +} + +function addNewServer( props ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + // TODO: try/catch here when error management is in place in the UI + tx.executeSql( "INSERT INTO servers(name, url, user, password, clientId, clientSecret) VALUES(?, ?, ?, ?, ?, ?)", + [ + props.name, + props.url, + props.user, + props.password, + props.clientId, + props.clientSecret + ] + ); + } + ); +} + +function updateServer( id, props ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + // TODO: try/catch here when error management is in place in the UI + tx.executeSql( "UPDATE servers SET " + + "name=?, " + + "url=?, " + + "user=?, " + + "password=?, " + + "clientId=?, " + + "clientSecret=? " + + "WHERE id=?", + [ + props.name, + props.url, + props.user, + props.password, + props.clientId, + props.clientSecret, + id + ] + ); + } + ); +} + +function setServerLastSync( id, last ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + tx.executeSql( "UPDATE servers SET lastSync=? WHERE id=?", [ last, id ] ); + } + + ) +} + +function connectToServer( id, cb ) +{ + var db = getDatabase(); + + db.readTransaction( + function( tx ) { + var err = null; + try { + var res = tx.executeSql( "SELECT url, user, password, clientId, clientSecret FROM servers WHERE id=?", [ id ] ); + if ( res.rows.length === 0 ) { + err = "No server with ID " + id + " found"; + } + else { + _sendAuthRequest( res.rows.item( 0 ), cb ); + } + } + catch( e ) { + err = e.message; + } + + if ( err !== null ) + cb( null, err ); + } + ); +} + +function _sendAuthRequest( props, cb ) +{ + var url = props.url; + if ( url.charAt( url.length - 1 ) !== "/" ) + url += "/"; + url += "oauth/v2/token"; + console.debug( "Sending auth request to " + url ); + + var http = new XMLHttpRequest(); + var params = "grant_type=password"; + params += "&username=" + escape( props.user ); + params += "&password=" + escape( props.password ); + params += "&client_id=" + escape( props.clientId ); + params += "&client_secret=" + escape( props.clientSecret ); + + http.onreadystatechange = function() { + if ( http.readyState === XMLHttpRequest.DONE ) { + console.debug( "Auth request response status is " + http.status ); + var json = null; + var err = null; + + if ( http.status === 200 ) { + try { + json = JSON.parse( http.responseText ) + } + catch( e ) { + json = null; + err = "Failed to parse server response: " + e.message + } + } + else { + if ( http.responseText.length ) { + try { + json = JSON.parse( http.responseText ) + } + catch( e ) { + json = http.responseText + } + } + + err = "HTTP request failed: " + http.status; + } + + cb( json, err ); + } + }; + + http.open( "POST", url, true ); + http.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" ); + http.setRequestHeader( "Content-length", params.length ); + http.setRequestHeader( "Connection", "close" ); + + http.send( params ); +} + +/* + Articles management + */ + +function getArticles( serverId, cb, filter ) +{ + var db = getDatabase(); + + db.readTransaction( + function( tx ) { + var articles = new Array + var err = null; + var where = ""; + + if ( filter & ArticlesFilter.Read ) + where += " AND archived=1"; + else + where += " AND archived=0"; + + if ( filter & ArticlesFilter.Starred ) + where += " AND starred=1"; + + try { + var res = tx.executeSql( "SELECT * FROM articles WHERE server=?" + where, [ serverId ] ); + for ( var i = 0; i < res.rows.length; ++i ) { + articles.push( res.rows[i] ); + } + } + catch( e ) { + } + + cb( articles, err ); + } + ); +} + +function articleExists( id, cb ) +{ + var db = getDatabase(); + + db.readTransaction( + function( tx ) { + var exists = false; + var err = null; + + try { + var res = tx.executeSql( "SELECT COUNT(*) AS count FROM articles WHERE id=?", [ id ] ); + if ( res.rows.length === 1 ) { + exists = ( res.rows[0].count === 0 ? false : true ); + } + else { + err = "Failed to get article from database when checking its existence"; + } + } + catch( e ) { + err = e.message; + } + + cb( exists, err ); + } + ); +} + +function saveArticle( props ) +{ + articleExists( + props.id, + function( exists, err ) { + if ( err !== null ) { + // TODO: if a callback is used to notify the caller of an error + // then in Server.qml the articles will have to be reported individually + // through a signal / slot mechanism + } + else { + if ( exists ) + _updateArticle( props ); + else + _insertArticle( props ); + } + } + + ); +} + +function _insertArticle( props ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + tx.executeSql( + "INSERT INTO articles(id,server,created,updated,mimetype,language,readingTime,url,domain,archived,starred,title,content) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)", + [ + props.id, + props.server, + props.created, + props.updated, + props.mimetype, + props.language, + props.readingTime, + props.url, + props.domain, + props.archived, + props.starred, + props.title, + props.content + ] + ); + } + ); +} + +function _updateArticle( props ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + tx.executeSql( + "UPDATE articles SET created=?, updated=?, mimetype=?, language=?, readingTime=?, url=?, domain=?, archived=?, starred=?, title=?, content=? WHERE id=?", + [ + props.created, + props.updated, + props.mimetype, + props.language, + props.readingTime, + props.url, + props.domain, + props.archived, + props.starred, + props.title, + props.content, + props.id + ] + ); + } + ); +} + +function deleteArticle( id ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + console.debug( "Delete article " + id + " from database" ); + tx.executeSql( "DELETE FROM articles WHERE id=?", [ id ] ); + } + ); +} + +function downloadArticles( props, cb ) +{ + var url = props.url; + if ( url.charAt( url.length - 1 ) !== "/" ) + url += "/"; + url += "api/entries.json"; + url += "?since=" + props.since; + url += "&perPage=10"; + + var articles = new Array; + + _downloadNextArticles( + url, + props.accessToken, + 1, + function( arts, done, err ) { + if ( err !== null ) { + cb( null, err ) + } + else { + if ( arts.length ) + articles.push.apply( articles, arts ); + if ( done ) + cb( articles, null ); + } + } + ); +} + +function _downloadNextArticles( url, token, page, cb ) +{ + var pageUrl = url; + pageUrl += "&page=" + page; + console.debug( "Getting articles at " + pageUrl ); + + var http = new XMLHttpRequest(); + + http.onreadystatechange = function() { + if ( http.readyState === XMLHttpRequest.DONE ) { + console.debug( "Articles download status code is " + http.status ) + var json = null; + var articles = null; + var done = true; + var err = null; + + if ( http.status === 200 ) { + try { + json = JSON.parse( http.responseText ) + articles = json._embedded.items; + if ( page < json.pages ) + done = false; + } + catch( e ) { + json = null; + err = "Failed to parse server response: " + e.message + } + } + else { + if ( http.responseText.length ) { + try { + articles = JSON.parse( http.responseText ) + } + catch( e ) { + articles = http.responseText + } + } + + err = "HTTP request failed: " + http.status; + } + + cb( articles, done, err ); + + if ( !done ) + _downloadNextArticles( url, token, page+1, cb ); + } + } + + http.open( "GET", pageUrl, true ); + http.setRequestHeader( "Authorization:", "Bearer " + token ); + + http.send(); +} + +function setArticleStar( id, star ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + tx.executeSql( "UPDATE articles SET starred=? WHERE id=?", [ star, id ] ); + } + ); +} + +function setArticleRead( id, read ) +{ + var db = getDatabase(); + + db.transaction( + function( tx ) { + tx.executeSql( "UPDATE articles SET archived=? WHERE id=?", [ read, id ] ); + } + ); +} + +/* + Internal functions + */ + +var DBVERSION = "0.2" +var _db = null; + +function getDatabase() +{ + if ( _db === null ) { + console.debug( "Opening new connection to the database" ); + _db = Storage.LocalStorage.openDatabaseSync( "WallaRead", "", "WallaRead", 1000000 ); + checkDatabaseStatus( _db ); + } + + return _db; +} + +function checkDatabaseStatus( db ) +{ + if ( db.version === "" ) { + createLatestDatabase( db ); + } + + if ( db.version === "0.1" ) { + db.transaction( + function( tx ) { + tx.executeSql( + "CREATE TABLE IF NOT EXISTS articles (" + + "id INTEGER PRIMARY KEY, " + + "server INTEGER REFERENCES servers(id), " + + "created TEXT, " + + "updated TEXT, " + + "mimetype TEXT, " + + "language TEXT, " + + "readingTime INTEGER DEFAULT 0, " + + "url TEXT, " + + "domain TEXT, " + + "archived INTEGER DEFAULT 0, " + + "starred INTEGER DEFAULT 0, " + + "title TEXT, " + + "previewPicture BLOB, " + + "content TEXT" + + ")" + ); + + db.changeVersion( db.version, DBVERSION ); + } + ) + } +} + +function createLatestDatabase( db ) +{ + var version = db.version; + + if ( version !== DBVERSION ) { + db.transaction( + function( tx ) { + tx.executeSql( "CREATE TABLE IF NOT EXISTS servers (" + + "id INTEGER PRIMARY KEY AUTOINCREMENT, " + + "name TEXT NOT NULL, " + + "url TEXT NOT NULL, " + + "user TEXT NOT NULL, " + + "password TEXT NOT NULL, " + + "clientId TEXT NOT NULL, " + + "clientSecret TEXT NOT NULL, " + + "lastSync INTEGER DEFAULT 0" + + ")" + ); + + tx.executeSql( + "CREATE TABLE IF NOT EXISTS articles (" + + "id INTEGER PRIMARY KEY, " + + "server INTEGER REFERENCES servers(id), " + + "created TEXT, " + + "updated TEXT, " + + "mimetype TEXT, " + + "language TEXT, " + + "readingTime INTEGER DEFAULT 0, " + + "url TEXT, " + + "domain TEXT, " + + "archived INTEGER DEFAULT 0, " + + "starred INTEGER DEFAULT 0, " + + "title TEXT, " + + "previewPicture BLOB, " + + "content TEXT" + + ")" + ); + + db.changeVersion( version, DBVERSION ); + } + ); + } +} + +function resetDatabase() +{ + var db = getDatabase(); + var version = db.version; + + db.transaction( + function( tx ) { + tx.executeSql( "DROP TABLE IF EXISTS servers" ); + tx.executeSql( "DROP TABLE IF EXISTS articles" ); + db.changeVersion( version, "" ); + createLatestDatabase( db ); + } + ); +} diff --git a/qml/models/ArticlesModel.qml b/qml/models/ArticlesModel.qml new file mode 100644 index 0000000..8990410 --- /dev/null +++ b/qml/models/ArticlesModel.qml @@ -0,0 +1,66 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 + +import "../js/WallaBase.js" as WallaBase + +ListModel { + id: articlesModel + + property bool loaded: false + property bool showAll: false + property bool showRead: false + property bool showStarred: false + + signal error( string message ) + + function load( serverId ) { + loaded = false + var filter = 0; + + if ( showAll ) { + filter = WallaBase.ArticlesFilter.All + } + else { + if ( showRead ) + filter |= WallaBase.ArticlesFilter.Read + + if ( showStarred ) + filter |= WallaBase.ArticlesFilter.Starred + } + + WallaBase.getArticles( serverId, onArticlesLoaded, filter ) + } + + function onArticlesLoaded( articles, err ) { + loaded = true + if ( err !== null ) { + error( err ) + } + else { + clear() + for ( var i = 0; i < articles.length; ++i ) { + append( articles[i] ) + } + } + } +} diff --git a/qml/models/ServersModel.qml b/qml/models/ServersModel.qml new file mode 100644 index 0000000..ecce5ca --- /dev/null +++ b/qml/models/ServersModel.qml @@ -0,0 +1,52 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 + +import "../types" +import "../js/WallaBase.js" as WallaBase + +ListModel { + id: serversModel + + property bool loaded: false + + signal error( string message ) + + function load() { + loaded = false + clear() + WallaBase.getServers( onServersLoaded ) + } + + function onServersLoaded( servers, err ) { + loaded = true + + if ( err !== null ) { + error( err ) + } + else { + for ( var i = 0; i < servers.length; ++i ) { + append( servers[i] ) + } + } + } +} diff --git a/qml/pages/ArticlePage.qml b/qml/pages/ArticlePage.qml new file mode 100644 index 0000000..a717f3e --- /dev/null +++ b/qml/pages/ArticlePage.qml @@ -0,0 +1,39 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Page { + id: articlePage + allowedOrientations: Orientation.All + + property string content + + SilicaWebView { + id: webview + anchors.fill: parent + + Component.onCompleted: { + loadHtml( articlePage.content ) + } + } +} diff --git a/qml/pages/ServerPage.qml b/qml/pages/ServerPage.qml new file mode 100644 index 0000000..af65188 --- /dev/null +++ b/qml/pages/ServerPage.qml @@ -0,0 +1,279 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +import "../models" +import "../types" +import "../js/WallaBase.js" as WallaBase + +Page { + id: serverPage + allowedOrientations: Orientation.All + + property int serverId + property alias server: server + + Server { + id: server + serverId: serverPage.serverId + + onArticlesDownloaded: { + serverPage.updateArticlesList() + } + + onError: { + showError( message ) + } + } + + ArticlesModel { + id: articlesModel + + onError: { + showError( message ) + } + } + + function updateArticlesList() { + articlesModel.load( serverId ) + } + + function showError( message ) { + // TODO: display this message to the user + console.error( message ) + } + + Component.onCompleted: { + updateArticlesList() + } + + Rectangle { + id: busyContainer + visible: !articlesModel.loaded + anchors.fill: parent + color: "black" + opacity: 0.6 + z: 5 + + MouseArea { + anchors.fill: parent + } + + BusyIndicator { + id: serversBusyIndicator + running: busyContainer.visible + anchors.centerIn: parent + size: BusyIndicatorSize.Large + } + } + + SilicaListView { + anchors.fill: parent + spacing: Theme.paddingMedium + model: articlesModel + + PullDownMenu { + MenuItem { + text: articlesModel.showStarred ? qsTr( "Show unstarred articles" ) : qsTr( "Show only starred articles" ) + onClicked: { + articlesModel.showStarred = !articlesModel.showStarred + serverPage.updateArticlesList() + } + } + + MenuItem { + text: articlesModel.showRead ? qsTr( "Show unread articles" ) : qsTr( "Show read articles" ) + onClicked: { + articlesModel.showRead = !articlesModel.showRead + serverPage.updateArticlesList() + } + } + + MenuItem { + text: qsTr( "Refresh" ) + onClicked: { + articlesModel.loaded = false + server.getArticles() + } + } + } + + header: PageHeader { + title: server.name + } + + ViewPlaceholder { + enabled: articlesModel.count == 0 + text: qsTr( "No articles saved on this server yet" ) + } + + delegate: ListItem { + id: listEntry + width: parent.width + contentHeight: titleLabel.height + infoRow.height + + RemorseItem { + id: remorse + } + + function showRemorse( idx ) { + remorse.execute( + listEntry, + qsTr( "Deleting" ), + function() { + var id = articlesModel.get( idx ).id + articlesModel.remove( idx ) + serverPage.server.deleteArticle( + id, + function( err ) { + if ( err !== null ) { + showError( err ) + // Just reload the whole list. May be inefficient though + serverPage.updateArticlesList() + } + } + ) + } + ) + } + + menu: ContextMenu { + id: articleMenu + + Row { + id: actionsRow + width: parent.width + spacing: Theme.paddingLarge + x: ( width / 2 ) - ( ( 2 * spacing + starButton.width + toggleReadButton.width + deleteButton.width ) / 2 ) + + IconButton { + id: starButton + icon.source: model.starred ? "image://theme/icon-m-favorite-selected" : "image://theme/icon-m-favorite" + + onClicked: { + starButton.enabled = false + + serverPage.server.toggleArticleStar( + model, + function( star, err ) { + articleMenu.hide() + + if ( err !== null ) { + showError( err ) + } + else { + serverPage.updateArticlesList() + } + } + ) + } + } + + IconButton { + id: toggleReadButton + icon.source: "image://theme/icon-m-acknowledge" + ( model.archived ? "?" + Theme.secondaryColor : "" ) + + onClicked: { + toggleReadButton.enabled = false + + serverPage.server.toggleArticleRead( + model, + function( read, err ) { + articleMenu.hide() + + if ( err !== null ) { + showError( err ) + } + else { + serverPage.updateArticlesList() + } + } + ) + } + } + + IconButton { + id: deleteButton + icon.source: "image://theme/icon-m-delete" + + onClicked: { + listEntry.enabled = false + articleMenu.hide() + listEntry.showRemorse( index ) + } + } + } + } + + Column { + width: parent.width - 2*Theme.horizontalPageMargin + x: Theme.horizontalPageMargin + + Label { + id: titleLabel + width: parent.width + color: listEntry.highlighted ? Theme.highlightColor : Theme.primaryColor + wrapMode: Text.WordWrap + text: model.title + } + + Item { + id: infoRow + width: parent.width + height: Math.max( readingTimeIcon.height, readingTimeLabel.height ) + + Row { + id: readingTimeRow + anchors.left: parent.left + + Image { + id: readingTimeIcon + source: "image://theme/icon-s-duration" + anchors.verticalCenter: parent.verticalCenter + } + + Label { + id: readingTimeLabel + font.pixelSize: Theme.fontSizeSmall + anchors.verticalCenter: parent.verticalCenter + color: Theme.secondaryColor + text: " " + model.readingTime + } + } + + Label { + id: domainLabel + anchors.right: parent.right + font.pixelSize: Theme.fontSizeSmall + color: Theme.secondaryColor + text: model.domain + } + } + } + + onClicked: { + pageStack.push( Qt.resolvedUrl( "ArticlePage.qml" ), model ) + } + } + } +} diff --git a/qml/pages/ServerSettingsDialog.qml b/qml/pages/ServerSettingsDialog.qml new file mode 100644 index 0000000..a8d0962 --- /dev/null +++ b/qml/pages/ServerSettingsDialog.qml @@ -0,0 +1,140 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +import "../types" +import "../js/WallaBase.js" as WallaBase + +Dialog { + id: serverSettingsDialog + allowedOrientations: Orientation.All + canAccept: true + + property int serverId + + ServerSettings { + id: serverSettings + serverId: serverSettingsDialog.serverId + + onError: { + // TODO: display this message to the user + console.error( message ) + } + } + + onAccepted: { + var props = { + name: nameField.text, + url: urlField.text, + user: userField.text, + password: passwordField.text, + clientId: clientIdField.text, + clientSecret: clientSecretField.text + } + + if ( serverId === -1 ) + WallaBase.addNewServer( props ) + else + WallaBase.updateServer( serverId, props ) + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: column.height + width: parent.width + + PullDownMenu { + MenuItem { + text: "Export" + } + } + + Column { + id: column + anchors.fill: parent + width: parent.width + + DialogHeader { + acceptText: qsTr( "Save" ) + } + + TextField { + id: nameField + width: parent.width + label: qsTr( "Server Alias" ) + placeholderText: qsTr( "Server Alias" ) + text: serverSettings.name + focus: true + EnterKey.enabled: text.length > 0 + EnterKey.onClicked: urlField.focus = true + } + + TextField { + id: urlField + width: parent.width + label: qsTr( "URL" ) + placeholderText: qsTr( "Server URL" ) + text: serverSettings.url + EnterKey.enabled: text.length > 0 + EnterKey.onClicked: userField.focus = true + } + + TextField { + id: userField + width: parent.width + label: qsTr( "Login" ) + placeholderText: qsTr( "User Login" ) + text: serverSettings.user + EnterKey.enabled: text.length > 0 + EnterKey.onClicked: passwordField.focus = true + } + + PasswordField { + id: passwordField + width: parent.width + label: "Password" + text: serverSettings.password + EnterKey.enabled: text.length > 0 + EnterKey.onClicked: clientIdField.focus = true + } + + TextField { + id: clientIdField + width: parent.width + label: qsTr( "Client ID" ) + placeholderText: qsTr( "Client ID" ) + text: serverSettings.clientId + EnterKey.enabled: text.length > 0 + EnterKey.onClicked: clientSecretField.focus = true + } + + TextField { + id: clientSecretField + width: parent.width + label: qsTr( "Client Secret" ) + placeholderText: qsTr( "Client Secret" ) + text: serverSettings.clientSecret + } + } + } +} diff --git a/qml/pages/ServersPage.qml b/qml/pages/ServersPage.qml new file mode 100644 index 0000000..b700fe2 --- /dev/null +++ b/qml/pages/ServersPage.qml @@ -0,0 +1,124 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +import "../models" +import "../types" +import "../js/WallaBase.js" as WallaBase + +Page { + id: serversPage + allowedOrientations: Orientation.All + + ServersModel { + id: serversModel + loaded: false + + onError: function( msg ) { + // TODO: display this message to the user + console.error( msg ) + } + } + + function updateServerList() { + serversModel.load() + } + + function resetDatabase() { + WallaBase.resetDatabase() + updateServerList() + } + + Component.onCompleted: { + updateServerList() + } + + SilicaListView { + anchors.fill: parent + spacing: Theme.paddingMedium + model: serversModel + visible: serversModel.loaded + + PullDownMenu { + MenuItem { + text: qsTr( "Reset database" ) + onClicked: resetDatabase() + } + + MenuItem { + text: qsTr( "Settings" ) + onClicked: { + var page = pageStack.push( Qt.resolvedUrl( "SettingsPage.qml" ) ) + page.serverListChanged.connect( updateServerList ) + } + } + } + + header: PageHeader { + title: qsTr( "Wallabag servers" ) + } + + ViewPlaceholder { + enabled: serversModel.loaded && serversModel.count == 0 + text: qsTr( "No servers configured yet, create your first one with the Settings menu" ) + } + + delegate: ListItem { + id: listEntry + width: parent.width + + Item { + width: parent.width - 2 * Theme.horizontalPageMargin + x: Theme.horizontalPageMargin + anchors.verticalCenter: parent.verticalCenter + + Rectangle { + id: serverCountLabel + height: listEntry.height - 1.5 * Theme.horizontalPageMargin + width: height + radius: 2 + color: listEntry.highlighted ? Theme.primaryColor : Theme.highlightBackgroundColor + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + + Label { + anchors.centerIn: parent + text: model.unread + font.pixelSize: Theme.fontSizeSmall + } + } + + Label { + id: serverAliasLabel + anchors.verticalCenter: parent.verticalCenter + anchors.left: serverCountLabel.right + anchors.leftMargin: Theme.paddingMedium + color: listEntry.highlighted ? Theme.highlightColor : Theme.primaryColor + text: model.name + } + } + + onClicked: pageStack.push( Qt.resolvedUrl( "ServerPage.qml" ), { serverId: model.id } ) + } + } +} diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml new file mode 100644 index 0000000..b99ceee --- /dev/null +++ b/qml/pages/SettingsPage.qml @@ -0,0 +1,92 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +import "../models" + +Page { + id: settingsPage + allowedOrientations: Orientation.All + + signal serverListChanged + + onServerListChanged: updateServerList() + + ServersModel { + id: serversModel + } + + function updateServerList() { + serversModel.load() + } + + Component.onCompleted: { + updateServerList() + } + + SilicaListView { + anchors.fill: parent + spacing: Theme.paddingMedium + + model: serversModel + + PullDownMenu { + MenuItem { + text: qsTr( "New Server" ) + onClicked: { + var dlg = pageStack.push( Qt.resolvedUrl( "ServerSettingsPage.qml" ), { serverId: -1 } ) + dlg.accepted.connect( serverListChanged ) + } + } + } + + header: PageHeader { + title: qsTr( "Settings" ) + } + + ViewPlaceholder { + enabled: serversModel.count == 0 + text: qsTr( "No server found, use the pulley menu and select 'New Server'" ) + } + + delegate: ListItem { + id: listEntry + width: parent.width + + Label { + x: Theme.horizontalPageMargin + anchors.verticalCenter: parent.verticalCenter + color: listEntry.highlighted ? Theme.highlightColor : Theme.primaryColor + text: model.name + } + + onClicked: { + var dlg = pageStack.push( Qt.resolvedUrl( "ServerSettingsDialog.qml" ), { serverId: model.id } ) + dlg.accepted.connect( serverListChanged ) + } + } + + VerticalScrollDecorator { + } + } +} diff --git a/qml/types/Server.qml b/qml/types/Server.qml new file mode 100644 index 0000000..bfb50ad --- /dev/null +++ b/qml/types/Server.qml @@ -0,0 +1,275 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 +import net.kamago.harbour.wallaread 1.0 + +import "../js/WallaBase.js" as WallaBase + +Item { + property int serverId: -1 + property string name + property string url + property int lastSync: 0 + property string accessToken + property string refreshToken + property string tokenType + property int tokenExpiry: 0 + + signal articlesDownloaded( var list ) + signal connected + signal error( string message ) + + onServerIdChanged: { + if ( serverId !== -1 ) { + console.debug( "Loading information for server " + serverId ) + WallaBase.getServer( serverId, onServerLoaded ) + } + else { + name = null + url = null + lastSync = 0 + accessToken = null + refreshToken = null + tokenType = null + tokenExpiry = 0 + } + } + + HttpRequester { + id: httpRequester + } + + function onServerLoaded( props, err ) { + if ( err !== null ) { + error( qsTr( "Failed to load server information: " ) + err ) + } + else { + name = props.name + url = props.url + lastSync = props.lastSync + } + } + + function connect( cb ) { + var now = Math.floor( (new Date).getTime() / 1000 ) + if ( tokenExpiry <= now ) { + console.debug( "Opening connection for server " + serverId ) + WallaBase.connectToServer( + serverId, + function( props, err ) { + onConnectionDone( props, err, cb ) + } + ) + } + else { + cb( null ); + } + } + + function onConnectionDone( props, err, cb ) { + if ( err === null ) { + console.debug( "Successfully connected to server " + serverId ) + accessToken = props.access_token + refreshToken = props.refresh_token + tokenType = props.token_type + tokenExpiry = Math.floor( (new Date).getTime() / 1000 ) + props.expires_in + } + + cb( err ) + } + + function isConnected() { + return tokenExpiry > Math.floor( (new Date).getTime() / 1000 ) + } + + function getArticles() { + connect( + function( err ) { + if ( err !== null ) { + error( qsTr( "Failed to connect to server: " ) + err) + } + else { + console.debug( "Downloading articles changes since last sync" ) + var props = { url: url, since: lastSync, accessToken: accessToken } + WallaBase.downloadArticles( props, onGetArticlesDone ) + } + } + ) + } + + function onGetArticlesDone( articles, err ) { + if ( err !== null ) { + error( qsTr( "Failed to download articles: " ) + err ) + } + else { + console.debug( "Retrieved " + articles.length + " new/updated articles" ) + var ret = new Array + + for ( var i = 0; i < articles.length; ++i ) { + var current = articles[i]; + var article = { + id: current.id, + server: serverId, + created: current.created_at, + updated: current.updated_at, + mimetype: current.mimetype, + language: current.language, + readingTime: current.reading_time, + url: current.url, + domain: current.domain_name, + archived: current.is_archived, + starred: current.is_starred, + title: current.title, + previewPicture: current.previewPicture, + content: current.content + } + WallaBase.saveArticle( article ) + ret.push( article ) + } + + WallaBase.setServerLastSync( serverId, Math.floor( (new Date).getTime() / 1000 ) ) + articlesDownloaded( ret ) + } + } + + function toggleArticleStar( article, cb ) { + connect( + function( err ) { + if ( err !== null ) { + cb( null, qsTr( "Failed to connect to server: " ) + err ); + } + else { + var articleUrl = url + if ( articleUrl.charAt( articleUrl.length - 1 ) !== "/" ) + articleUrl += "/" + articleUrl += "api/entries/" + article.id + ".json" + + var json = {} + json.starred = ( article.starred ? 0 : 1 ) + + console.debug( "Setting starred to " + json.starred + " on article " + article.id ) + + httpRequester.patch( + articleUrl, + accessToken, + JSON.stringify( json ), + function( patchResponse, patchError ) { + onToggleArticleStarDone( patchResponse, patchError, article, cb ) + } + ) + } + } + ) + } + + function onToggleArticleStarDone( content, err, article, cb ) { + if ( err !== null ) { + cb( null, qsTr( "Failed to set star status on article: " ) + err ) + } + else { + console.debug( "Done toggling starred status for article " + article.id ) + var json = JSON.parse( content ) + WallaBase.setArticleStar( article.id, json.is_starred ) + cb( json.is_starred, null ) + } + } + + function toggleArticleRead( article, cb ) { + connect( + function( err ) { + if ( err !== null ) { + cb( null, qsTr( "Failed to connect to server: " ) + err ) + } + else { + var articleUrl = url + if ( articleUrl.charAt( articleUrl.length - 1 ) !== "/" ) + articleUrl += "/" + articleUrl += "api/entries/" + article.id + ".json" + + var json = {} + json.archive = ( article.archived ? 0 : 1 ) + + console.debug( "Setting archived to " + json.archived + " on article " + article.id ) + + httpRequester.patch( + articleUrl, + accessToken, + JSON.stringify( json ), + function( patchResponse, patchError ) { + onToggleArticleReadDone( patchResponse, patchError, article, cb ) + } + ) + } + } + ) + } + + function onToggleArticleReadDone( content, err, article, cb ) { + if ( err !== null ) { + cb( null, qsTr( "Failed to set read status on article: " ) + err ) + } + else { + console.debug( "Done toggling archived status for article " + article.id ) + var json = JSON.parse( content ) + WallaBase.setArticleRead( article.id, json.is_archived ) + cb( json.is_archived, null ) + } + } + + function deleteArticle( id, cb ) { + connect( + function( err ) { + if ( err !== null ) { + cb( qsTr( "Failed to connect to server: " ) + err ) + } + else { + var articleUrl = url + if ( articleUrl.charAt( articleUrl.length - 1 ) !== "/" ) + articleUrl += "/" + articleUrl += "api/entries/" + id + ".json" + + console.debug( "Deleting article " + id ) + + httpRequester.del( + articleUrl, + accessToken, + function( delResponse, delError ) { + onDeleteArticleDone( delResponse, delError, id, cb ) + } + + ) + } + } + ) + } + + function onDeleteArticleDone( content, err, id, cb ) { + if ( err !== null ) { + cb( qsTr( "Failed to delete article: " ) + err ) + } + else { + console.debug( "Done deleting article " + id ) + WallaBase.deleteArticle( id ) + cb( null ) + } + } +} diff --git a/qml/types/ServerSettings.qml b/qml/types/ServerSettings.qml new file mode 100644 index 0000000..1072519 --- /dev/null +++ b/qml/types/ServerSettings.qml @@ -0,0 +1,65 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +import QtQuick 2.0 + +import "../js/WallaBase.js" as WallaBase + +QtObject { + property int serverId: -1 + property string name + property string url + property string user + property string password + property string clientId + property string clientSecret + + signal error( string message ) + + onServerIdChanged: { + if ( serverId !== -1 ) { + console.debug( "Loading information for server " + serverId ) + WallaBase.getServerSettings( serverId, onServerSettingsLoaded ) + } + else { + name = null + url = null + user = null + password = null + clientId = null + clientSecret = null + } + } + + function onServerSettingsLoaded( props, err ) { + if ( err !== null ) { + error( qsTr( "Failed to load server settings: " + err ) ) + } + else { + name = props.name + url = props.url + user = props.user + password = props.password + clientId = props.clientId + clientSecret = props.clientSecret + } + } +} diff --git a/rpm/harbour-wallaread.changes.in b/rpm/harbour-wallaread.changes.in new file mode 100644 index 0000000..7960259 --- /dev/null +++ b/rpm/harbour-wallaread.changes.in @@ -0,0 +1,14 @@ +# Rename this file as harbour-wallaread.changes to include changelog +# entries in your RPM file. +# +# Add new changelog entries following the format below. +# Add newest entries to the top of the list. +# Separate entries from eachother with a blank line. + +# * date Author's Name version-release +# - Summary of changes + +* Sun Apr 13 2014 Jack Tar 0.0.1-1 +- Scrubbed the deck +- Hoisted the sails + diff --git a/rpm/harbour-wallaread.spec b/rpm/harbour-wallaread.spec new file mode 100644 index 0000000..bda6096 --- /dev/null +++ b/rpm/harbour-wallaread.spec @@ -0,0 +1,71 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.27 +# + +Name: harbour-wallaread + +# >> macros +# << macros + +%{!?qtc_qmake:%define qtc_qmake %qmake} +%{!?qtc_qmake5:%define qtc_qmake5 %qmake5} +%{!?qtc_make:%define qtc_make make} +%{?qtc_builddir:%define _builddir %qtc_builddir} +Summary: WallaRead - A Wallabag 2+ client for Sailfish OS +Version: 0.1 +Release: 1 +Group: Qt/Qt +License: LICENSE +URL: http://example.org/ +Source0: %{name}-%{version}.tar.bz2 +Source100: harbour-wallaread.yaml +Requires: sailfishsilica-qt5 >= 0.10.9 +BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: desktop-file-utils + +%description +Short description of my Sailfish OS Application + + +%prep +%setup -q -n %{name}-%{version} + +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qtc_qmake5 + +%qtc_make %{?_smp_mflags} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%qmake5_install + +# >> install post +# << install post + +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop + +%files +%defattr(-,root,root,-) +%{_bindir} +%{_datadir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png +# >> files +# << files diff --git a/rpm/harbour-wallaread.yaml b/rpm/harbour-wallaread.yaml new file mode 100644 index 0000000..e21acd3 --- /dev/null +++ b/rpm/harbour-wallaread.yaml @@ -0,0 +1,45 @@ +Name: harbour-wallaread +Summary: WallaRead - A Wallabag 2+ client for Sailfish OS +Version: 0.1 +Release: 1 +# The contents of the Group field should be one of the groups listed here: +# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS +Group: Qt/Qt +URL: http://example.org/ +License: LICENSE +# This must be generated before uploading a package to a remote build service. +# Usually this line does not need to be modified. +Sources: +- '%{name}-%{version}.tar.bz2' +Description: | + Short description of my Sailfish OS Application +Configure: none +# The qtc5 builder inserts macros to allow QtCreator to have fine +# control over qmake/make execution +Builder: qtc5 + +# This section specifies build dependencies that are resolved using pkgconfig. +# This is the preferred way of specifying build dependencies for your package. +PkgConfigBR: + - sailfishapp >= 1.0.2 + - Qt5Core + - Qt5Qml + - Qt5Quick + +# Build dependencies without a pkgconfig setup can be listed here +# PkgBR: +# - package-needed-to-build + +# Runtime dependencies which are not automatically detected +Requires: + - sailfishsilica-qt5 >= 0.10.9 + +# All installed files +Files: + - '%{_bindir}' + - '%{_datadir}/%{name}' + - '%{_datadir}/applications/%{name}.desktop' + - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' + +# For more information about yaml and what's supported in Sailfish OS +# build system, please see https://wiki.merproject.org/wiki/Spectacle diff --git a/src/harbour-wallaread.cpp b/src/harbour-wallaread.cpp new file mode 100644 index 0000000..1e1acc7 --- /dev/null +++ b/src/harbour-wallaread.cpp @@ -0,0 +1,44 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +#ifdef QT_QML_DEBUG +#include +#endif + +#include + +#include "httprequester.h" + +int main(int argc, char *argv[]) +{ + // SailfishApp::main() will display "qml/template.qml", if you need more + // control over initialization, you can use: + // + // - SailfishApp::application(int, char *[]) to get the QGuiApplication * + // - SailfishApp::createView() to get a new QQuickView * instance + // - SailfishApp::pathTo(QString) to get a QUrl to a resource file + // + // To display the view, call "show()" (will show fullscreen on device). + + qmlRegisterType( "net.kamago.harbour.wallaread", 1, 0, "HttpRequester" ); + + return SailfishApp::main(argc, argv); +} diff --git a/src/httprequester.cpp b/src/httprequester.cpp new file mode 100644 index 0000000..420c486 --- /dev/null +++ b/src/httprequester.cpp @@ -0,0 +1,150 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +#include "httprequester.h" + +#include +#include +#include +#include + +/* + * HttpBaseRequest + */ + +HttpBaseRequest::HttpBaseRequest( QString const& url, QString const& token, QJSValue callback ) + : mUrl( url ), mToken( token ), mCallback( callback ) +{ +} + +/* + * HttpPatchRequest + */ + +HttpPatchRequest::HttpPatchRequest( QString const& url, QString const& token, QString const& content, QJSValue callback ) + : HttpBaseRequest( url, token, callback ), mContent( content.toUtf8() ), mReply( NULL ) +{ + mContentIO = new QBuffer( &mContent, this ); +} + +void HttpPatchRequest::start() +{ + QByteArray authHeader( "Bearer " ); + authHeader.append( mToken ); + + QNetworkRequest rq( mUrl ); + rq.setRawHeader( QByteArray( "Authorization" ), authHeader ); + + mReply = mQnam.sendCustomRequest( rq, QByteArray( "PATCH" ), mContentIO ); + connect( mReply, &QNetworkReply::finished, this, &HttpPatchRequest::onRequestDone ); +} + +void HttpPatchRequest::onRequestDone() +{ + QString content; + QString error; + + if ( mReply->error() ) { + error = "Network error: "; + error.append( mReply->errorString() ); + } + else { + content = QString( mReply->readAll() ); + } + + mReply->deleteLater(); + mReply = NULL; + + emit done( content, error ); +} + +/* + * HttpDeleteRequest + */ + +HttpDeleteRequest::HttpDeleteRequest( QString const& url, QString const& token, QJSValue callback ) + : HttpBaseRequest( url, token, callback ) +{ +} + +void HttpDeleteRequest::start() +{ + QByteArray authHeader( "Bearer " ); + authHeader.append( mToken ); + + QNetworkRequest rq( mUrl ); + rq.setRawHeader( QByteArray( "Authorization" ), authHeader ); + + mReply = mQnam.sendCustomRequest( rq, QByteArray( "DELETE" ) ); + connect( mReply, &QNetworkReply::finished, this, &HttpDeleteRequest::onRequestDone ); +} + +void HttpDeleteRequest::onRequestDone() +{ + QString content; + QString error; + + if ( mReply->error() ) { + error = "Network error: "; + error.append( mReply->errorString() ); + } + + mReply->deleteLater(); + mReply = NULL; + + emit done( content, error ); +} + +/* + * HttpRequester + */ + +HttpRequester::HttpRequester( QObject *parent ) + : QObject( parent ) +{ +} + +void HttpRequester::patch( QString const& url, QString const& token, QString const& content, QJSValue callback ) +{ + HttpPatchRequest *req = new HttpPatchRequest( url, token, content, callback ); + connect( req, &HttpPatchRequest::done, this, &HttpRequester::onRequestDone ); + req->start(); +} + +void HttpRequester::del( QString const& url, QString const& token, QJSValue callback ) +{ + HttpDeleteRequest *req = new HttpDeleteRequest( url, token, callback ); + connect( req, &HttpDeleteRequest::done, this, &HttpRequester::onRequestDone ); + req->start(); +} + +void HttpRequester::onRequestDone( QString const& content, QString const& error ) +{ + HttpBaseRequest *req = qobject_cast( QObject::sender() ); + QJSValueList args; + args << content; + if ( error.isEmpty() ) + args << QJSValue::NullValue; + else + args << error; + req->mCallback.call( args ); + req->deleteLater(); +} diff --git a/src/httprequester.h b/src/httprequester.h new file mode 100644 index 0000000..062f87f --- /dev/null +++ b/src/httprequester.h @@ -0,0 +1,97 @@ +/* + * WallaRead - A Wallabag 2+ client for SailfishOS + * © 2016 Grégory Oestreicher + * + * This file is part of WallaRead. + * + * WallaRead 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. + * + * WallaRead 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 WallaRead. If not, see . + * + */ + +#ifndef HTTPREQUESTER_H +#define HTTPREQUESTER_H + +#include +#include +#include +#include + +class HttpBaseRequest : public QObject +{ + Q_OBJECT + +public: + HttpBaseRequest( QString const& url, QString const& token, QJSValue callback ); + + virtual void start() = 0; + + QString mUrl; + QString mToken; + QJSValue mCallback; + +signals: + void done( QString content, QString error ); +}; + +class HttpPatchRequest : public HttpBaseRequest +{ + Q_OBJECT + +public: + HttpPatchRequest( QString const& url, QString const& token, QString const& content, QJSValue callback ); + + virtual void start() override; + + QByteArray mContent; + +private slots: + void onRequestDone(); + +private: + QNetworkAccessManager mQnam; + QIODevice* mContentIO; + QNetworkReply* mReply; +}; + +class HttpDeleteRequest : public HttpBaseRequest +{ + Q_OBJECT + +public: + HttpDeleteRequest( QString const& url, QString const& token, QJSValue callback ); + + virtual void start() override; + +private slots: + void onRequestDone(); + +private: + QNetworkAccessManager mQnam; + QNetworkReply* mReply; +}; + +class HttpRequester : public QObject +{ + Q_OBJECT +public: + explicit HttpRequester( QObject *parent = 0 ); + + Q_INVOKABLE void patch( QString const& url, QString const& token, QString const& content, QJSValue callback ); + Q_INVOKABLE void del( QString const& url, QString const& token, QJSValue callback ); + +private slots: + void onRequestDone( QString const& content, QString const& error ); +}; + +#endif // HTTPREQUESTER_H diff --git a/translations/harbour-wallaread.ts b/translations/harbour-wallaread.ts new file mode 100644 index 0000000..4b760bd --- /dev/null +++ b/translations/harbour-wallaread.ts @@ -0,0 +1,138 @@ + + + + + CoverPage + + My Cover + + + + + Server + + Failed to load server information: + + + + Failed to connect to server: + + + + Failed to download articles: + + + + Failed to set star status on article: + + + + Failed to set read status on article: + + + + Failed to delete article: + + + + + ServerPage + + Refresh + + + + No articles saved on this server yet + + + + Deleting + + + + Show unstarred articles + + + + Show only starred articles + + + + Show unread articles + + + + Show read articles + + + + + ServerSettingsDialog + + Save + + + + Server Alias + + + + URL + + + + Server URL + + + + Login + + + + User Login + + + + Client ID + + + + Client Secret + + + + + ServersPage + + Reset database + + + + Settings + + + + Wallabag servers + + + + No servers configured yet, create your first one with the Settings menu + + + + + SettingsPage + + New Server + + + + Settings + + + + No server found, use the pulley menu and select 'New Server' + + + +