diff options
| author | nachoparker <nacho@ownyourbits.com> | 2019-10-28 03:39:42 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2019-10-28 06:35:12 +0300 |
| commit | 0fc23905c0330a29e9a2d6f031b66fc85c8ffd64 (patch) | |
| tree | 82e601855a59227d8fb46fdd5eab657a864d9ed9 | |
| parent | f23d6c6bf9c9d791dee73658860a103e283b59bd (diff) | |
add ncp-previewsv1.18.0
Signed-off-by: nachoparker <nacho@ownyourbits.com>
add ncp-previews
Signed-off-by: nachoparker <nacho@ownyourbits.com>
36 files changed, 2848 insertions, 12 deletions
diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh index 1b213eef..b81c39e2 100644 --- a/bin/ncp/CONFIG/nc-init.sh +++ b/bin/ncp/CONFIG/nc-init.sh @@ -148,13 +148,15 @@ EOF ncc app:install notes ncc app:install tasks ncc app:install news - ncc app:install previewgenerator ncc app:enable calendar ncc app:enable contacts ncc app:enable notes ncc app:enable tasks ncc app:enable news + + # ncp-previewgenerator + cp -r /var/www/ncp-previewgenerator /var/www/nextcloud/apps/previewgenerator ncc app:enable previewgenerator # previews diff --git a/bin/ncp/CONFIG/nc-previews-auto.sh b/bin/ncp/CONFIG/nc-previews-auto.sh index 43d876ff..10384530 100644 --- a/bin/ncp/CONFIG/nc-previews-auto.sh +++ b/bin/ncp/CONFIG/nc-previews-auto.sh @@ -29,7 +29,13 @@ configure() cat > /usr/local/bin/nc-previews <<EOF #!/bin/bash echo -e "\n[ nc-previews-auto ]" >> /var/log/ncp.log -ionice -c3 nice -n20 /usr/local/bin/ncc preview:pre-generate -n -vvv 2>&1 >>/var/log/ncp.log & +( + for i in \$(seq 1 \$(nproc)); do + ionice -c3 nice -n20 /usr/local/bin/ncc preview:pre-generate -n -vvv & + done + wait +) 2>&1 >>/var/log/ncp.log & + PID=\$! [[ "$RUNTIME" != 0 ]] && { for i in \$(seq 1 1 $RUNTIME); do diff --git a/bin/ncp/TOOLS/nc-previews.sh b/bin/ncp/TOOLS/nc-previews.sh index 6dac9e30..13251455 100644 --- a/bin/ncp/TOOLS/nc-previews.sh +++ b/bin/ncp/TOOLS/nc-previews.sh @@ -11,6 +11,11 @@ configure() { + pgrep -af preview:pre-generate &>/dev/null || pgrep -af preview:generate-all &>/dev/null && { + echo "nc-previews is already running" + return 1 + } + [[ "$CLEAN" == "yes" ]] && { local datadir datadir=$( ncc config:system:get datadirectory ) || { @@ -23,9 +28,19 @@ configure() ncc files:scan-app-data -n } - [[ "$INCREMENTAL" == "yes" ]] && { ncc preview:pre-generate -n -vvv; return $?; } + [[ "$INCREMENTAL" == "yes" ]] && { + for i in $(seq 1 $(nproc)); do + ncc preview:pre-generate -n -vvv & + done + wait + return + } - ncc preview:generate-all -n -v -p "$PATH1" + for i in $(seq 1 $(nproc)); do + [[ "$PATH1" != "" ]] && PATH_ARG=(-p "$PATH1") + ncc preview:generate-all -n -v ${PATH_ARG[@]} & + done + wait } install() { :; } diff --git a/changelog.md b/changelog.md index 247818a9..278cb21c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v1.17.1](https://github.com/nextcloud/nextcloudpi/commit/b50801a) (2019-09-29) nc-backup: exclude group folders in dataless backup +[v1.18.0](https://github.com/nextcloud/nextcloudpi/commit/c140109) (2019-10-27) add ncp-previews -[v1.17.0](https://github.com/nextcloud/nextcloudpi/commit/05e78cc) (2019-09-28) upgrade to NC16.0.5 +[v1.17.1 ](https://github.com/nextcloud/nextcloudpi/commit/c63cb27) (2019-09-29) nc-backup: exclude group folders in dataless backup + +[v1.17.0 ](https://github.com/nextcloud/nextcloudpi/commit/05e78cc) (2019-09-28) upgrade to NC16.0.5 [v1.16.9 ](https://github.com/nextcloud/nextcloudpi/commit/46b2187) (2019-09-28) fix apt stuck in interactive conf file dialog diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index 0112991f..1aaf8a5b 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -13,12 +13,13 @@ SHELL ["/bin/bash", "-c"] ENV DOCKERBUILD 1 RUN mkdir -p /tmp/ncp-build -COPY bin/ /tmp/ncp-build/bin/ -COPY etc /tmp/ncp-build/etc/ -COPY ncp.sh update.sh /tmp/ncp-build/ -COPY ncp-web /tmp/ncp-build/ncp-web/ -COPY ncp-app /tmp/ncp-build/ncp-app/ -COPY docker /tmp/ncp-build/docker/ +COPY bin/ /tmp/ncp-build/bin/ +COPY etc /tmp/ncp-build/etc/ +COPY ncp.sh update.sh /tmp/ncp-build/ +COPY ncp-web /tmp/ncp-build/ncp-web/ +COPY ncp-app /tmp/ncp-build/ncp-app/ +COPY ncp-previewgenerator /tmp/ncp-build/ncp-previewgenerator/ +COPY docker /tmp/ncp-build/docker/ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ diff --git a/ncp-previewgenerator/.travis.yml b/ncp-previewgenerator/.travis.yml new file mode 100644 index 00000000..66f01ba7 --- /dev/null +++ b/ncp-previewgenerator/.travis.yml @@ -0,0 +1,45 @@ +language: php +php: + - 7 + - 7.1 + - 7.2 + +env: + global: + - CORE_BRANCH=master + - APP_NAME=previewgenerator + matrix: + - DB=sqlite + +branches: + only: + - master + - /^stable\d+(\.\d+)?$/ + +before_install: + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - . ./before_install.sh $APP_NAME $CORE_BRANCH $DB + + # Add some output debugging information + - cd ../server + - ./occ check + - ./occ status + - ./occ app:list + - ./occ app:enable $APP_NAME + +script: + - cd apps/$APP_NAME/ + + # Test the app + - sh -c "find . -name \*.php -exec php -l \"{}\" \;;" + - cd ../../ + #- sh -c "./occ app:check-code $APP_NAME -c private -c strong-comparison;" + #- sh -c "./occ app:check-code $APP_NAME -c deprecation;" + - cd apps/$APP_NAME/ + + # Run phpunit tests + - cd tests/ + - sh -c "phpunit --configuration phpunit.xml" + +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/ncp-previewgenerator/CHANGELOG.md b/ncp-previewgenerator/CHANGELOG.md new file mode 100644 index 00000000..507faa27 --- /dev/null +++ b/ncp-previewgenerator/CHANGELOG.md @@ -0,0 +1,82 @@ +## 2.1.0 - 2019-03-05 +### Added +- Nextcloud 16 support + +## 2.0.0 - 2018-11-08 + +- PHP 7.x required +- Nextcloud 14 only +- Moved to migrations for DB handling +- Added path option to generate command (thanks to @adduxa) +- Nextcloud 15 compatible + +## 1.0.9 - 2017-12-29 + +### Fixes + +### Added +- Show timestamp in occ commands [#88](https://github.com/rullzer/previewgenerator/pull/88) +- Add Composer Classmap for file (NC13) [#90](https://github.com/rullzer/previewgenerator/pull/90) +- Respect .nomedia [#92](https://github.com/rullzer/previewgenerator/pull/92) +- Use PID to check for already running process [#93](https://github.com/rullzer/previewgenerator/pull/93) + +## 1.0.8 - 2017-12-21 + +### Fixes +- Do not add file if it already is in the table [#86](https://github.com/rullzer/previewgenerator/pull/86) + +### Added +- Allow to specify sizes to be generated [#87](https://github.com/rullzer/previewgenerator/pull/86) + +## 1.0.7 - 2017-09-26 + +### Fixes +- Updated/Fixed README + - [#55](https://github.com/rullzer/previewgenerator/pull/55) @Eeems + - [#58](https://github.com/rullzer/previewgenerator/pull/58) @MichaIng + - [#67](https://github.com/rullzer/previewgenerator/pull/67) @sndrr +- Avoid folder processing on pre-generate [#73](https://github.com/rullzer/previewgenerator/pull/73) @Seik + +### Added +- Make NC13 Compatible [#63](https://github.com/rullzer/previewgenerator/pull/63) + +## 1.0.6 - 2017-05-05 + +### Fixed +- Better preview error handling [#51](https://github.com/rullzer/previewgenerator/pull/51) @icewind1991 +- Travis test runs [#53](https://github.com/rullzer/previewgenerator/pull/53) + +### Added +- README.md [#52](https://github.com/rullzer/previewgenerator/pull/52) +- CHANGELOG.md [#52](https://github.com/rullzer/previewgenerator/pull/52) + +## 1.0.5 - 2017-03-17 + +### Added +- Generate more preview sizes +- Add --force command to break lock + +## 1.0.4 - 2017-03-14 + +### Fixed +- Lock timeout was 30 hours instead of minutes + +## 1.0.3 - 2017-03-14 + +### Added +- Do not use app with encryption +- Check for already running command + +## 1.0.2 - 2017-03-08 + +### Added +- More verbose output of commands +- Hack around preview generation errors by not trying the file again in the next run + +## 1.0.1 - 2016-12-08 + +### Fixed +- Pimp info.xml + +## 1.0.0 – 2016-12-07 +Initial release diff --git a/ncp-previewgenerator/LICENSE b/ncp-previewgenerator/LICENSE new file mode 100644 index 00000000..dbbe3558 --- /dev/null +++ b/ncp-previewgenerator/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +<http://www.gnu.org/licenses/>. diff --git a/ncp-previewgenerator/Makefile b/ncp-previewgenerator/Makefile new file mode 100644 index 00000000..4cb7cb0d --- /dev/null +++ b/ncp-previewgenerator/Makefile @@ -0,0 +1,36 @@ +# Makefile for building the project + +app_name=previewgenerator +project_dir=$(CURDIR)/../$(app_name) +build_dir=$(CURDIR)/build/artifacts +sign_dir=$(build_dir)/sign +appstore_dir=$(build_dir)/appstore +source_dir=$(build_dir)/source +package_name=$(app_name) +cert_dir=$(HOME)/.nextcloud/certificates + +appstore: + mkdir -p $(sign_dir) + rsync -a \ + --exclude=.git \ + --exclude=build \ + --exclude=.gitignore \ + --exclude=.travis.yml \ + --exclude=.scrutinizer.yml \ + --exclude=CONTRIBUTING.md \ + --exclude=composer.json \ + --exclude=composer.lock \ + --exclude=composer.phar \ + --exclude=l10n/.tx \ + --exclude=l10n/no-php \ + --exclude=Makefile \ + --exclude=nbproject \ + --exclude=screenshots \ + --exclude=phpunit*xml \ + --exclude=tests \ + --exclude=vendor/bin \ + $(project_dir) $(sign_dir) + @echo "Signing…" + tar -czf $(build_dir)/$(app_name).tar.gz \ + -C $(sign_dir) $(app_name) + openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name).tar.gz | openssl base64 diff --git a/ncp-previewgenerator/README.md b/ncp-previewgenerator/README.md new file mode 100644 index 00000000..98bb4103 --- /dev/null +++ b/ncp-previewgenerator/README.md @@ -0,0 +1,96 @@ +# Preview Generator + +Nextcloud app that allows admins to pre-generate previews. The app listens to +edit events and stores this information. Once a cron job is triggered it will +start preview generation. This means that you can better utilize your +system by pre-generating previews when your system is normally idle and thus +putting less load on your machine when the requests are actually served. + +The app does not replace on demand preview generation so if a preview is +requested before it is pre-generated it will still be shown. + +## How to install + +* Install directly from within your Nextcloud from the [app store](https://apps.nextcloud.com/apps/previewgenerator) +* Clone this repository in you Nextcloud app folder + +## How to use the app + +1. Install the app +2. Enable the app +3. Run `./occ preview:generate-all` once after installation. +4. Add a (system) cron job for ` ./occ preview:pre-generate` + * I run it every 10 minutes + +## Known issues + +* The app does not work with encryption enabled + +## How does the app work + +1. Listen to events that a file has been written or modified and store it in the database +2. On cron run request previews for the files that have been written or modified + +If a preview already exists at step 2 then requesting it is really cheap. If not +it will be generated. Depending on the sizes of the files and the hardware you +are running on the time this takes can vary. + +## Commands + +### preview:delete_old + +This removes the previews from the old preview location that was used before +Nextcloud 11. That has some issues. Note that the gallery shipped with Nextcloud +11 did not yet use this location. So you might want to run it again with Nextcloud 12. + +### preview:generate-all [user-id] + +Loop over all files and try to generate previews for them. If `user-id` is supplied +just loop over the files for that user. + +### preview:pre-generate + +Do the actual pregeneration. This means only for new or modified files (since +the app was enabled or the last pregeneration was done). + +## FAQ + +### Why can't I use webcron? + +Preview generation can be a very long running job. Thus we need a system that +does not time out. + +### It sometimes crashed + +Yes this happens. Most of it is due to corrupted files not being handled that gracefully +in the Nextcloud server. Improvements in this area are coming with Nextcloud 12 + +### I get "Command already running" + +Yes this happens when the `pre-generate` command crashes. No worries the lock +will be released after 30 minutes of inactivity from the app. So go grab a cookie. + +### I don't want to generate all the preview sizes + +This is possible since version 1.0.8. Just set the correct values via the command line + +``` +./occ config:app:set --value="32 64 1024" previewgenerator squareSizes +./occ config:app:set --value="64 128 1024" previewgenerator widthSizes +./occ config:app:set --value="64 256 1024" previewgenerator heightSizes +``` + +This will only generate: + * square previews of: 32x32, 64x64 and 1024x1024 + * aspect ratio previews with a width of: 64, 128 and 1024 + * aspect ratio previews with a height of: 64, 256 and 1024 + +Note: + * preview sizes are always a power of 2. + * The smallest size is 32 + * The max size is determined by your preview settings in config.php + + ### I get "PHP Fatal error: Allowed memory size of X bytes exhausted" + You need to increase the memory allowance of PHP, by default it is 128 MB. You do that by changing the memory_limit in the php.ini file. + + If you use the docker container you need to create the php.ini file in /usr/local/etc/php first. diff --git a/ncp-previewgenerator/appinfo/app.php b/ncp-previewgenerator/appinfo/app.php new file mode 100644 index 00000000..781cab2f --- /dev/null +++ b/ncp-previewgenerator/appinfo/app.php @@ -0,0 +1,23 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +$app = new \OCA\PreviewGenerator\AppInfo\Application(); diff --git a/ncp-previewgenerator/appinfo/info.xml b/ncp-previewgenerator/appinfo/info.xml new file mode 100644 index 00000000..e6e198e4 --- /dev/null +++ b/ncp-previewgenerator/appinfo/info.xml @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> + <id>previewgenerator</id> + <name>NCP Preview Generator</name> + <summary>A faster preview pre-generation app</summary> + <description><![CDATA[The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served. + +The app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown. +Use this app through ncp-web section 'nc-previews' and 'nc-previews-auto' +The first time you activate this app through 'nc-previews-auto', you properly want to generate all previews via ncp-web, section 'nc-previews', non incremental mode. +**./occ preview:generate-all -vvv** +]]> + </description> + <licence>AGPL</licence> + <author>Roeland Jago Douma and Ignacio Nunez</author> + <version>2.2.0</version> + <namespace>PreviewGenerator</namespace> + <category>multimedia</category> + <website>https://nextcloudpi.com</website> + <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs> + <repository type="git">https://github.com/nextcloud/nextcloudpi</repository> + <types> + <filesystem/> + </types> + <dependencies> + <php min-version="7.0"/> + <nextcloud min-version="14" max-version="17" /> + </dependencies> + + <commands> + <command>OCA\PreviewGenerator\Command\Generate</command> + <command>OCA\PreviewGenerator\Command\DeleteOld</command> + <command>OCA\PreviewGenerator\Command\PreGenerate</command> + </commands> +</info> diff --git a/ncp-previewgenerator/composer/autoload.php b/ncp-previewgenerator/composer/autoload.php new file mode 100644 index 00000000..9d93afc1 --- /dev/null +++ b/ncp-previewgenerator/composer/autoload.php @@ -0,0 +1,7 @@ +<?php + +// autoload.php @generated by Composer + +require_once __DIR__ . '/composer/autoload_real.php'; + +return ComposerAutoloaderInitPreviewGenerator::getLoader(); diff --git a/ncp-previewgenerator/composer/composer.json b/ncp-previewgenerator/composer/composer.json new file mode 100644 index 00000000..5805e88b --- /dev/null +++ b/ncp-previewgenerator/composer/composer.json @@ -0,0 +1,13 @@ +{ + "config" : { + "vendor-dir": ".", + "optimize-autoloader": true, + "classmap-authoritative": true, + "autoloader-suffix": "PreviewGenerator" + }, + "autoload" : { + "psr-4": { + "OCA\\PreviewGenerator\\": "../lib/" + } + } +} diff --git a/ncp-previewgenerator/composer/composer/ClassLoader.php b/ncp-previewgenerator/composer/composer/ClassLoader.php new file mode 100644 index 00000000..95f7e097 --- /dev/null +++ b/ncp-previewgenerator/composer/composer/ClassLoader.php @@ -0,0 +1,445 @@ +<?php + +/* + * This file is part of Composer. + * + * (c) Nils Adermann <naderman@naderman.de> + * Jordi Boggiano <j.boggiano@seld.be> + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Autoload; + +/** + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. + * + * $loader = new \Composer\Autoload\ClassLoader(); + * + * // register classes with namespaces + * $loader->add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier <fabien@symfony.com> + * @author Jordi Boggiano <j.boggiano@seld.be> + * @see http://www.php-fig.org/psr/psr-0/ + * @see http://www.php-fig.org/psr/psr-4/ + */ +class ClassLoader +{ + // PSR-4 + private $prefixLengthsPsr4 = array(); + private $prefixDirsPsr4 = array(); + private $fallbackDirsPsr4 = array(); + + // PSR-0 + private $prefixesPsr0 = array(); + private $fallbackDirsPsr0 = array(); + + private $useIncludePath = false; + private $classMap = array(); + private $classMapAuthoritative = false; + private $missingClasses = array(); + private $apcuPrefix; + + public function getPrefixes() + { + if (!empty($this->prefixesPsr0)) { + return call_user_func_array('array_merge', $this->prefixesPsr0); + } + + return array(); + } + + public function getPrefixesPsr4() + { + return $this->prefixDirsPsr4; + } + + public function getFallbackDirs() + { + return $this->fallbackDirsPsr0; + } + + public function getFallbackDirsPsr4() + { + return $this->fallbackDirsPsr4; + } + + public function getClassMap() + { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + */ + public function addClassMap(array $classMap) + { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + */ + public function add($prefix, $paths, $prepend = false) + { + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + (array) $paths, + $this->fallbackDirsPsr0 + ); + } else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + (array) $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = (array) $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + (array) $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + */ + public function addPsr4($prefix, $paths, $prepend = false) + { + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + (array) $paths, + $this->fallbackDirsPsr4 + ); + } else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + (array) $paths + ); + } + } elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + (array) $paths, + $this->prefixDirsPsr4[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 base directories + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + */ + public function setPsr4($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + */ + public function setUseIncludePath($useIncludePath) + { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() + { + return $this->useIncludePath; + } + + /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoritative + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = $classMapAuthoritative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function isClassMapAuthoritative() + { + return $this->classMapAuthoritative; + } + + /** + * APCu prefix to use to cache found/not-found classes, if the extension is enabled. + * + * @param string|null $apcuPrefix + */ + public function setApcuPrefix($apcuPrefix) + { + $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null; + } + + /** + * The APCu prefix in use, or null if APCu caching is not enabled. + * + * @return string|null + */ + public function getApcuPrefix() + { + return $this->apcuPrefix; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + } + + /** + * Unregisters this instance as an autoloader. + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return bool|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + includeFile($file); + + return true; + } + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { + return false; + } + if (null !== $this->apcuPrefix) { + $file = apcu_fetch($this->apcuPrefix.$class, $hit); + if ($hit) { + return $file; + } + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if (false === $file && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if (null !== $this->apcuPrefix) { + apcu_add($this->apcuPrefix.$class, $file); + } + + if (false === $file) { + // Remember that this class does not exist. + $this->missingClasses[$class] = true; + } + + return $file; + } + + private function findFileWithExtension($class, $ext) + { + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengthsPsr4[$first])) { + $subPath = $class; + while (false !== $lastPos = strrpos($subPath, '\\')) { + $subPath = substr($subPath, 0, $lastPos); + $search = $subPath . '\\'; + if (isset($this->prefixDirsPsr4[$search])) { + $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); + foreach ($this->prefixDirsPsr4[$search] as $dir) { + if (file_exists($file = $dir . $pathEnd)) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); + } else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + + return false; + } +} + +/** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + */ +function includeFile($file) +{ + include $file; +} diff --git a/ncp-previewgenerator/composer/composer/LICENSE b/ncp-previewgenerator/composer/composer/LICENSE new file mode 100644 index 00000000..f27399a0 --- /dev/null +++ b/ncp-previewgenerator/composer/composer/LICENSE @@ -0,0 +1,21 @@ + +Copyright (c) Nils Adermann, Jordi Boggiano + +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/ncp-previewgenerator/composer/composer/autoload_classmap.php b/ncp-previewgenerator/composer/composer/autoload_classmap.php new file mode 100644 index 00000000..26656a36 --- /dev/null +++ b/ncp-previewgenerator/composer/composer/autoload_classmap.php @@ -0,0 +1,18 @@ +<?php + +// autoload_classmap.php @generated by Composer + +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = $vendorDir; + +return array( + 'OCA\\PreviewGenerator\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', + 'OCA\\PreviewGenerator\\Command\\DeleteOld' => $baseDir . '/../lib/Command/DeleteOld.php', + 'OCA\\PreviewGenerator\\Command\\Generate' => $baseDir . '/../lib/Command/Generate.php', + 'OCA\\PreviewGenerator\\Command\\PreGenerate' => $baseDir . '/../lib/Command/PreGenerate.php', + 'OCA\\PreviewGenerator\\Command\\TimestampFormatter' => $baseDir . '/../lib/Command/TimestampFormatter.php', + 'OCA\\PreviewGenerator\\Migration\\Version020000Date20180823071939' => $baseDir . '/../lib/Migration/Version020000Date20180823071939.php', + 'OCA\\PreviewGenerator\\Migration\\Version020200Date20190608205303' => $baseDir . '/../lib/Migration/Version020200Date20190608205303.php', + 'OCA\\PreviewGenerator\\SizeHelper' => $baseDir . '/../lib/SizeHelper.php', + 'OCA\\PreviewGenerator\\Watcher' => $baseDir . '/../lib/Watcher.php', +); diff --git a/ncp-previewgenerator/composer/composer/autoload_namespaces.php b/ncp-previewgenerator/composer/composer/autoload_namespaces.php new file mode 100644 index 00000000..71c9e918 --- /dev/null +++ b/ncp-previewgenerator/composer/composer/autoload_namespaces.php @@ -0,0 +1,9 @@ +<?php + +// autoload_namespaces.php @generated by Composer + +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = $vendorDir; + +return array( +); diff --git a/ncp-previewgenerator/composer/composer/autoload_psr4.php b/ncp-previewgenerator/composer/composer/autoload_psr4.php new file mode 100644 index 00000000..4395b050 --- /dev/null +++ b/ncp-previewgenerator/composer/composer/autoload_psr4.php @@ -0,0 +1,10 @@ +<?php + +// autoload_psr4.php @generated by Composer + +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = $vendorDir; + +return array( + 'OCA\\PreviewGenerator\\' => array($baseDir . '/../lib'), +); diff --git a/ncp-previewgenerator/composer/composer/autoload_real.php b/ncp-previewgenerator/composer/composer/autoload_real.php new file mode 100644 index 00000000..61e74c66 --- /dev/null +++ b/ncp-previewgenerator/composer/composer/autoload_real.php @@ -0,0 +1,43 @@ +<?php + +// autoload_real.php @generated by Composer + +class ComposerAutoloaderInitPreviewGenerator +{ + private static $loader; + + public static function loadClassLoader($class) + { + if ('Composer\Autoload\ClassLoader' === $class) { + require __DIR__ . '/ClassLoader.php'; + } + } + + public static function getLoader() + { + if (null !== self::$loader) { + return self::$loader; + } + + spl_autoload_register(array('ComposerAutoloaderInitPreviewGenerator', 'loadClassLoader'), true, true); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(); + spl_autoload_unregister(array('ComposerAutoloaderInitPreviewGenerator', 'loadClassLoader')); + + $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); + if ($useStaticLoader) { + require_once __DIR__ . '/autoload_static.php'; + + call_user_func(\Composer\Autoload\ComposerStaticInitPreviewGenerator::getInitializer($loader)); + } else { + $classMap = require __DIR__ . '/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + } + + $loader->setClassMapAuthoritative(true); + $loader->register(true); + + return $loader; + } +} diff --git a/ncp-previewgenerator/composer/composer/autoload_static.php b/ncp-previewgenerator/composer/composer/autoload_static.php new file mode 100644 index 00000000..b2d98620 --- /dev/null +++ b/ncp-previewgenerator/composer/composer/autoload_static.php @@ -0,0 +1,44 @@ +<?php + +// autoload_static.php @generated by Composer + +namespace Composer\Autoload; + +class ComposerStaticInitPreviewGenerator +{ + public static $prefixLengthsPsr4 = array ( + 'O' => + array ( + 'OCA\\PreviewGenerator\\' => 21, + ), + ); + + public static $prefixDirsPsr4 = array ( + 'OCA\\PreviewGenerator\\' => + array ( + 0 => __DIR__ . '/..' . '/../lib', + ), + ); + + public static $classMap = array ( + 'OCA\\PreviewGenerator\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', + 'OCA\\PreviewGenerator\\Command\\DeleteOld' => __DIR__ . '/..' . '/../lib/Command/DeleteOld.php', + 'OCA\\PreviewGenerator\\Command\\Generate' => __DIR__ . '/..' . '/../lib/Command/Generate.php', + 'OCA\\PreviewGenerator\\Command\\PreGenerate' => __DIR__ . '/..' . '/../lib/Command/PreGenerate.php', + 'OCA\\PreviewGenerator\\Command\\TimestampFormatter' => __DIR__ . '/..' . '/../lib/Command/TimestampFormatter.php', + 'OCA\\PreviewGenerator\\Migration\\Version020000Date20180823071939' => __DIR__ . '/..' . '/../lib/Migration/Version020000Date20180823071939.php', + 'OCA\\PreviewGenerator\\Migration\\Version020200Date20190608205303' => __DIR__ . '/..' . '/../lib/Migration/Version020200Date20190608205303.php', + 'OCA\\PreviewGenerator\\SizeHelper' => __DIR__ . '/..' . '/../lib/SizeHelper.php', + 'OCA\\PreviewGenerator\\Watcher' => __DIR__ . '/..' . '/../lib/Watcher.php', + ); + + public static function getInitializer(ClassLoader $loader) + { + return \Closure::bind(function () use ($loader) { + $loader->prefixLengthsPsr4 = ComposerStaticInitPreviewGenerator::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitPreviewGenerator::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitPreviewGenerator::$classMap; + + }, null, ClassLoader::class); + } +} diff --git a/ncp-previewgenerator/composer/composer/installed.json b/ncp-previewgenerator/composer/composer/installed.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/ncp-previewgenerator/composer/composer/installed.json @@ -0,0 +1 @@ +[] diff --git a/ncp-previewgenerator/lib/AppInfo/Application.php b/ncp-previewgenerator/lib/AppInfo/Application.php new file mode 100644 index 00000000..e61dad84 --- /dev/null +++ b/ncp-previewgenerator/lib/AppInfo/Application.php @@ -0,0 +1,52 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\AppInfo; + +use OCA\PreviewGenerator\Watcher; +use OCP\AppFramework\App; +use OCP\AppFramework\IAppContainer; +use OCP\Files\IRootFolder; +use OCP\Files\Node; + +class Application extends App { + + const APPNAME='previewgenerator'; + + public function __construct() { + parent::__construct(self::APPNAME); + + $container = $this->getContainer(); + $this->connectWatcher($container); + } + + private function connectWatcher(IAppContainer $container) { + /** @var IRootFolder $root */ + $root = $container->query(IRootFolder::class); + $root->listen('\OC\Files', 'postWrite', function (Node $node) use ($container) { + /** @var Watcher $watcher */ + $watcher = $container->query(Watcher::class); + $watcher->postWrite($node); + }); + } +} diff --git a/ncp-previewgenerator/lib/Command/DeleteOld.php b/ncp-previewgenerator/lib/Command/DeleteOld.php new file mode 100644 index 00000000..d0ace747 --- /dev/null +++ b/ncp-previewgenerator/lib/Command/DeleteOld.php @@ -0,0 +1,97 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\Command; + +use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\IUser; +use OCP\IUserManager; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class DeleteOld extends Command { + + /** @var IUserManager */ + protected $userManager; + + /** @var IRootFolder */ + protected $rootFolder; + + public function __construct(IRootFolder $rootFolder, + IUserManager $userManager) { + parent::__construct(); + + $this->userManager = $userManager; + $this->rootFolder = $rootFolder; + } + + protected function configure() { + $this + ->setName('preview:delete_old') + ->setDescription('Delete old preview folder (pre NC11)') + ->addArgument( + 'user_id', + InputArgument::OPTIONAL, + 'Delete old preview folder for the given user' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output): int { + $userId = $input->getArgument('user_id'); + + if ($userId === null) { + $this->userManager->callForSeenUsers(function (IUser $user) { + $this->deletePreviews($user); + }); + } else { + $user = $this->userManager->get($userId); + if ($user !== null) { + $this->deletePreviews($user); + } + } + + return 0; + } + + private function deletePreviews(IUser $user) { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($user->getUID()); + + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + $userRoot = $userFolder->getParent(); + + try { + /** @var Folder $thumbnails */ + $thumbnails = $userRoot->get('thumbnails'); + $thumbnails->delete(); + } catch (NotFoundException $e) { + //Ignore + } + } + + +} diff --git a/ncp-previewgenerator/lib/Command/Generate.php b/ncp-previewgenerator/lib/Command/Generate.php new file mode 100644 index 00000000..7aafad98 --- /dev/null +++ b/ncp-previewgenerator/lib/Command/Generate.php @@ -0,0 +1,250 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator\Command; + +use OCA\PreviewGenerator\SizeHelper; +use OCP\Encryption\IManager; +use OCP\Files\File; +use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IPreview; +use OCP\IUser; +use OCP\IUserManager; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; + +class Generate extends Command { + + /** @var IUserManager */ + protected $userManager; + + /** @var IRootFolder */ + protected $rootFolder; + + /** @var IPreview */ + protected $previewGenerator; + + /** @var IConfig */ + protected $config; + + /** @var IDBConnection */ + protected $connection; + + /** @var OutputInterface */ + protected $output; + + /** @var int[][] */ + protected $sizes; + + /** @var IManager */ + protected $encryptionManager; + + public function __construct(IRootFolder $rootFolder, + IUserManager $userManager, + IPreview $previewGenerator, + IConfig $config, + IDBConnection $connection, + IManager $encryptionManager) { + parent::__construct(); + + $this->userManager = $userManager; + $this->rootFolder = $rootFolder; + $this->previewGenerator = $previewGenerator; + $this->config = $config; + $this->connection = $connection; + $this->encryptionManager = $encryptionManager; + } + + protected function configure() { + $this + ->setName('preview:generate-all') + ->setDescription('Generate previews') + ->addArgument( + 'user_id', + InputArgument::OPTIONAL, + 'Generate previews for the given user' + )->addOption( + 'path', + 'p', + InputOption::VALUE_OPTIONAL, + 'limit scan to this path, eg. --path="/alice/files/Photos", the user_id is determined by the path and the user_id parameter is ignored' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output): int { + if ($this->encryptionManager->isEnabled()) { + $output->writeln('Encryption is enabled. Aborted.'); + return 1; + } + + // Set timestamp output + $formatter = new TimestampFormatter($this->config, $output->getFormatter()); + $output->setFormatter($formatter); + $this->output = $output; + + $this->sizes = SizeHelper::calculateSizes($this->config); + + $inputPath = $input->getOption('path'); + if ($inputPath) { + $inputPath = '/' . trim($inputPath, '/'); + list (, $userId,) = explode('/', $inputPath, 3); + $user = $this->userManager->get($userId); + if ($user !== null) { + $this->generatePathPreviews($user, $inputPath); + } + } else { + $userId = $input->getArgument('user_id'); + if ($userId === null) { + $this->userManager->callForSeenUsers(function (IUser $user) { + $this->generateUserPreviews($user); + }); + } else { + $user = $this->userManager->get($userId); + if ($user !== null) { + $this->generateUserPreviews($user); + } + } + } + + return 0; + } + + private function generatePathPreviews(IUser $user, string $path) { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($user->getUID()); + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + try { + $relativePath = $userFolder->getRelativePath($path); + } catch (NotFoundException $e) { + $this->output->writeln('Path not found'); + return; + } + $pathFolder = $userFolder->get($relativePath); + $this->processFolder($pathFolder, $user); + } + + private function generateUserPreviews(IUser $user) { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($user->getUID()); + + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + $this->processFolder($userFolder, $user); + } + + private function processFolder(Folder $folder, IUser $user) { + // Respect the '.nomedia' file. If present don't traverse the folder + if ($folder->nodeExists('.nomedia')) { + $this->output->writeln('Skipping folder ' . $folder->getPath()); + return; + } + + // random sleep between 0 and 50ms to avoid collision between 2 processes + usleep(rand(0,50000)); + + $this->output->writeln('Scanning folder ' . $folder->getPath()); + + $nodes = $folder->getDirectoryListing(); + + foreach ($nodes as $node) { + if ($node instanceof Folder) { + $this->processFolder($node, $user); + } else if ($node instanceof File) { + $is_locked = false; + $qb = $this->connection->getQueryBuilder(); + $row = $qb->select('*') + ->from('preview_generation') + ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId()))) + ->setMaxResults(1) + ->execute() + ->fetch(); + if ($row !== false) { + if ($row['locked'] == 1) { + // already being processed + $is_locked = true; + } else { + $qb->update('preview_generation') + ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId()))) + ->set('locked', $qb->createNamedParameter(true)) + ->execute(); + } + } else { + $qb->insert('preview_generation') + ->values([ + 'uid' => $qb->createNamedParameter($user->getUID()), + 'file_id' => $qb->createNamedParameter($node->getId()), + 'locked' => $qb->createNamedParameter(true), + ]) + ->execute(); + } + + if ($is_locked === false) { + try { + $this->processFile($node); + } finally { + $qb->delete('preview_generation') + ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId()))) + ->execute(); + } + } + } + } + } + + private function processFile(File $file) { + if ($this->previewGenerator->isMimeSupported($file->getMimeType())) { + if ($this->output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) { + $this->output->writeln('Generating previews for ' . $file->getPath()); + } + + try { + foreach ($this->sizes['square'] as $size) { + $this->previewGenerator->getPreview($file, $size, $size, true); + } + + // Height previews + foreach ($this->sizes['height'] as $height) { + $this->previewGenerator->getPreview($file, -1, $height, false); + } + + // Width previews + foreach ($this->sizes['width'] as $width) { + $this->previewGenerator->getPreview($file, $width, -1, false); + } + } catch (NotFoundException $e) { + // Maybe log that previews could not be generated? + } catch (\InvalidArgumentException $e) { + $error = $e->getMessage(); + $this->output->writeln("<error>${error}</error>"); + } + } + } + +} diff --git a/ncp-previewgenerator/lib/Command/PreGenerate.php b/ncp-previewgenerator/lib/Command/PreGenerate.php new file mode 100644 index 00000000..5f34fca9 --- /dev/null +++ b/ncp-previewgenerator/lib/Command/PreGenerate.php @@ -0,0 +1,221 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\Command; + +use OCA\PreviewGenerator\SizeHelper; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\Encryption\IManager; +use OCP\Files\File; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IPreview; +use OCP\IUserManager; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; + +class PreGenerate extends Command { + + /** @var string */ + protected $appName; + + /** @var IUserManager */ + protected $userManager; + + /** @var IRootFolder */ + protected $rootFolder; + + /** @var IPreview */ + protected $previewGenerator; + + /** @var IConfig */ + protected $config; + + /** @var IDBConnection */ + protected $connection; + + /** @var OutputInterface */ + protected $output; + + /** @var int[][] */ + protected $sizes; + + /** @var IManager */ + protected $encryptionManager; + + /** @var ITimeFactory */ + protected $time; + + /** + * @param string $appName + * @param IRootFolder $rootFolder + * @param IUserManager $userManager + * @param IPreview $previewGenerator + * @param IConfig $config + * @param IDBConnection $connection + * @param IManager $encryptionManager + * @param ITimeFactory $time + */ + public function __construct($appName, + IRootFolder $rootFolder, + IUserManager $userManager, + IPreview $previewGenerator, + IConfig $config, + IDBConnection $connection, + IManager $encryptionManager, + ITimeFactory $time) { + parent::__construct(); + + $this->appName = $appName; + $this->userManager = $userManager; + $this->rootFolder = $rootFolder; + $this->previewGenerator = $previewGenerator; + $this->config = $config; + $this->connection = $connection; + $this->encryptionManager = $encryptionManager; + $this->time = $time; + } + + protected function configure() { + $this + ->setName('preview:pre-generate') + ->setDescription('Pre generate previews'); + } + + /** + * @param InputInterface $input + * @param OutputInterface $output + * @return int + */ + protected function execute(InputInterface $input, OutputInterface $output) { + if ($this->encryptionManager->isEnabled()) { + $output->writeln('Encryption is enabled. Aborted.'); + return 1; + } + + // Set timestamp output + $formatter = new TimestampFormatter($this->config, $output->getFormatter()); + $output->setFormatter($formatter); + $this->output = $output; + + $this->sizes = SizeHelper::calculateSizes($this->config); + $this->startProcessing(); + + return 0; + } + + private function startProcessing() { + // random sleep between 0 and 50ms to avoid collision between 2 processes + usleep(rand(0,50000)); + + while(true) { + $qb = $this->connection->getQueryBuilder(); + $row = $qb->select('*') + ->from('preview_generation') + ->where($qb->expr()->eq('locked', $qb->createNamedParameter(false))) + ->setMaxResults(1) + ->execute() + ->fetch(); + + if ($row === false) { + break; + } + + $qb->update('preview_generation') + ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id']))) + ->set('locked', $qb->createNamedParameter(true)) + ->execute(); + try { + $this->processRow($row); + } finally { + $qb->delete('preview_generation') + ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id']))) + ->execute(); + } + } + } + + private function processRow($row) { + //Get user + $user = $this->userManager->get($row['uid']); + + if ($user === null) { + return; + } + + try { + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + $userRoot = $userFolder->getParent(); + } catch (NotFoundException $e) { + return; + } + + //Get node + $nodes = $userRoot->getById($row['file_id']); + + if ($nodes === []) { + return; + } + + $node = $nodes[0]; + if ($node instanceof File) { + $this->processFile($node); + } + } + + private function processFile(File $file) { + if ($this->previewGenerator->isMimeSupported($file->getMimeType())) { + if ($this->output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) { + $this->output->writeln('Generating previews for ' . $file->getPath()); + } + + try { + foreach ($this->sizes['square'] as $size) { + $this->previewGenerator->getPreview($file, $size, $size, true); + } + + // Height previews + foreach ($this->sizes['height'] as $height) { + $this->previewGenerator->getPreview($file, -1, $height, false); + } + + // Width previews + foreach ($this->sizes['width'] as $width) { + $this->previewGenerator->getPreview($file, $width, -1, false); + } + } catch (NotFoundException $e) { + if ($this->output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) { + $error = $e->getMessage(); + $this->output->writeln("<error>${error} " . $file->getPath() . " not found.</error>"); + } + } catch (\InvalidArgumentException $e) { + $error = $e->getMessage(); + $this->output->writeln("<error>${error}</error>"); + } + } + } + +} diff --git a/ncp-previewgenerator/lib/Command/TimestampFormatter.php b/ncp-previewgenerator/lib/Command/TimestampFormatter.php new file mode 100644 index 00000000..b7169392 --- /dev/null +++ b/ncp-previewgenerator/lib/Command/TimestampFormatter.php @@ -0,0 +1,120 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling <coding@schilljs.com> + * + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\PreviewGenerator\Command; + +use OCP\IConfig; +use Symfony\Component\Console\Formatter\OutputFormatterInterface; +use Symfony\Component\Console\Formatter\OutputFormatterStyleInterface; + +/** + * TODO: This was taken from the server. At some point we should have it in OCP + * and then just use that + * + * Class TimestampFormatter + * + * @package OCA\PreviewGenerator\Command + */ +class TimestampFormatter implements OutputFormatterInterface { + /** @var IConfig */ + protected $config; + + /** @var OutputFormatterInterface */ + protected $formatter; + + /** + * @param IConfig $config + * @param OutputFormatterInterface $formatter + */ + public function __construct(IConfig $config, OutputFormatterInterface $formatter) { + $this->config = $config; + $this->formatter = $formatter; + } + + /** + * Sets the decorated flag. + * + * @param bool $decorated Whether to decorate the messages or not + */ + public function setDecorated($decorated) { + $this->formatter->setDecorated($decorated); + } + + /** + * Gets the decorated flag. + * + * @return bool true if the output will decorate messages, false otherwise + */ + public function isDecorated(): bool { + return $this->formatter->isDecorated(); + } + + /** + * Sets a new style. + * + * @param string $name The style name + * @param OutputFormatterStyleInterface $style The style instance + */ + public function setStyle($name, OutputFormatterStyleInterface $style) { + $this->formatter->setStyle($name, $style); + } + + /** + * Checks if output formatter has style with specified name. + * + * @param string $name + * @return bool + */ + public function hasStyle($name): bool { + return $this->formatter->hasStyle($name); + } + + /** + * Gets style options from style with specified name. + * + * @param string $name + * @return OutputFormatterStyleInterface + * @throws \InvalidArgumentException When style isn't defined + */ + public function getStyle($name): OutputFormatterStyleInterface { + return $this->formatter->getStyle($name); + } + + /** + * Formats a message according to the given styles. + * + * @param string $message The message to style + * @return string The styled message, prepended with a timestamp using the + * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00" + */ + public function format($message): string { + + $timeZone = $this->config->getSystemValue('logtimezone', 'UTC'); + $timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null; + + $time = new \DateTime('now', $timeZone); + $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM)); + + return $timestampInfo . ' ' . $this->formatter->format($message); + } +} diff --git a/ncp-previewgenerator/lib/Migration/Version020000Date20180823071939.php b/ncp-previewgenerator/lib/Migration/Version020000Date20180823071939.php new file mode 100644 index 00000000..7cebcd45 --- /dev/null +++ b/ncp-previewgenerator/lib/Migration/Version020000Date20180823071939.php @@ -0,0 +1,62 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator\Migration; + +use OCP\DB\ISchemaWrapper; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; + +class Version020000Date20180823071939 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if (!$schema->hasTable('preview_generation')) { + $table = $schema->createTable('preview_generation'); + $table->addColumn('id', 'integer', [ + 'autoincrement' => true, + 'notnull' => true, + 'length' => 4, + ]); + $table->addColumn('uid', 'string', [ + 'notnull' => true, + 'length' => 256, + ]); + $table->addColumn('file_id', 'integer', [ + 'notnull' => true, + 'length' => 4, + ]); + $table->setPrimaryKey(['id']); + } + return $schema; + } +} diff --git a/ncp-previewgenerator/lib/Migration/Version020200Date20190608205303.php b/ncp-previewgenerator/lib/Migration/Version020200Date20190608205303.php new file mode 100644 index 00000000..dd6ad7f5 --- /dev/null +++ b/ncp-previewgenerator/lib/Migration/Version020200Date20190608205303.php @@ -0,0 +1,53 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyleft (c) 2019, Ignacio Nunez <nacho@ownyourbits.com> + * + * @author Ignacio Nunez <nacho@ownyourbits.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator\Migration; + +use OCP\DB\ISchemaWrapper; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; +use Doctrine\DBAL\Types\Type; + +class Version020200Date20190608205303 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + $table = $schema->getTable('preview_generation'); + + if (!$table->hasColumn('locked')) { + $table->addColumn('locked', Type::BOOLEAN, [ + 'notnull' => true, + 'default' => 0, + ]); + } + return $schema; + } +} diff --git a/ncp-previewgenerator/lib/SizeHelper.php b/ncp-previewgenerator/lib/SizeHelper.php new file mode 100644 index 00000000..c49b253b --- /dev/null +++ b/ncp-previewgenerator/lib/SizeHelper.php @@ -0,0 +1,101 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2017, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator; + +use OCP\IConfig; + +class SizeHelper { + + public static function calculateSizes(IConfig $config): array { + /* + * First calculate the systems max sizes + */ + + $sizes = [ + 'square' => [], + 'height' => [], + 'width' => [], + ]; + + $maxW = (int)$config->getSystemValue('preview_max_x', 4096); + $maxH = (int)$config->getSystemValue('preview_max_y', 4096); + + $s = 32; + while($s <= $maxW || $s <= $maxH) { + $sizes['square'][] = $s; + $s *= 2; + } + + $w = 32; + while($w <= $maxW) { + $sizes['width'][] = $w; + $w *= 2; + } + + $h = 32; + while($h <= $maxH) { + $sizes['height'][] = $h; + $h *= 2; + } + + + /* + * Now calculate the user provided max sizes + * Note that only powers of 2 matter but if users supply different + * stuff it is their own fault and we just ignore it + */ + $getCustomSizes = function(IConfig $config, $key) { + $TXT = $config->getAppValue('previewgenerator', $key, ''); + $values = []; + if ($TXT !== '') { + foreach (explode(' ', $TXT) as $value) { + if (ctype_digit($value)) { + $values[] = (int)$value; + } + } + } + + return $values; + }; + + $squares = $getCustomSizes($config, 'squareSizes'); + $widths = $getCustomSizes($config, 'widthSizes'); + $heights = $getCustomSizes($config, 'heightSizes'); + + if ($squares !== []) { + $sizes['square'] = array_intersect($sizes['square'], $squares); + } + + if ($widths !== []) { + $sizes['width'] = array_intersect($sizes['width'], $widths); + } + + if ($heights !== []) { + $sizes['height'] = array_intersect($sizes['height'], $heights); + } + + return $sizes; + } +} diff --git a/ncp-previewgenerator/lib/Watcher.php b/ncp-previewgenerator/lib/Watcher.php new file mode 100644 index 00000000..5344ff7b --- /dev/null +++ b/ncp-previewgenerator/lib/Watcher.php @@ -0,0 +1,77 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator; + +use OCP\Files\Folder; +use OCP\Files\Node; +use OCP\IDBConnection; +use OCP\IUserManager; + +class Watcher { + + /** @var IDBConnection */ + private $connection; + + /** @var IUserManager */ + private $userManager; + + public function __construct(IDBConnection $connection, + IUserManager $userManager) { + $this->connection = $connection; + $this->userManager = $userManager; + } + + public function postWrite(Node $node) { + $absPath = ltrim($node->getPath(), '/'); + $owner = explode('/', $absPath)[0]; + + if ($node instanceof Folder || !$this->userManager->userExists($owner)) { + return; + } + + $qb = $this->connection->getQueryBuilder(); + $qb->select('id') + ->from('preview_generation') + ->where( + $qb->expr()->andX( + $qb->expr()->eq('uid', $qb->createNamedParameter($owner)), + $qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId())) + ) + )->setMaxResults(1); + $cursor = $qb->execute(); + $inTable = $cursor->fetch() !== false; + $cursor->closeCursor(); + + // Don't insert if there is already such an entry + if ($inTable) { + return; + } + + $qb = $this->connection->getQueryBuilder(); + $qb->insert('preview_generation') + ->setValue('uid', $qb->createNamedParameter($owner)) + ->setValue('file_id', $qb->createNamedParameter($node->getId())); + $qb->execute(); + } +} diff --git a/ncp-previewgenerator/tests/WatcherTest.php b/ncp-previewgenerator/tests/WatcherTest.php new file mode 100644 index 00000000..a89bbc05 --- /dev/null +++ b/ncp-previewgenerator/tests/WatcherTest.php @@ -0,0 +1,98 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\Tests; + +use OCA\PreviewGenerator\Watcher; +use OCP\Files\Node; +use OCP\IDBConnection; +use OCP\IUserManager; +use Test\TestCase; + +/** + * Class WatcherTest + * + * @package OCA\PreviewGenerator\Tests + * @group DB + */ +class WatcherTest extends TestCase { + + /** @var IDBConnection */ + private $connection; + + /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + private $userManager; + + /** @var Watcher */ + private $watcher; + + public function setUp() { + parent::setUp(); + + $this->connection = \OC::$server->getDatabaseConnection(); + $this->userManager = $this->createMock(IUserManager::class); + $this->watcher = new Watcher($this->connection, $this->userManager); + + $qb = $this->connection->getQueryBuilder(); + $qb->delete('preview_generation'); + } + + public function testPostWriteCantFindUser() { + $node = $this->createMock(Node::class); + $node->method('getPath') + ->willReturn('/foo/bar/baz'); + + $this->userManager->expects($this->once()) + ->method('userExists') + ->with('foo') + ->willReturn(false); + + $this->watcher->postWrite($node); + } + + public function testPostWrite() { + $node = $this->createMock(Node::class); + $node->method('getPath') + ->willReturn('/foo/bar/baz'); + $node->method('getId') + ->willReturn(42); + + $this->userManager->expects($this->once()) + ->method('userExists') + ->with('foo') + ->willReturn(true); + + $this->watcher->postWrite($node); + + $qb = $this->connection->getQueryBuilder(); + $qb->select('*') + ->from('preview_generation'); + $cursor = $qb->execute(); + $rows = $cursor->fetchAll(); + $cursor->closeCursor(); + + $this->assertCount(1, $rows); + $row = $rows[0]; + $this->assertSame('foo', $row['uid']); + $this->assertSame('42', $row['file_id']); + } +} diff --git a/ncp-previewgenerator/tests/bootstrap.php b/ncp-previewgenerator/tests/bootstrap.php new file mode 100644 index 00000000..a2699765 --- /dev/null +++ b/ncp-previewgenerator/tests/bootstrap.php @@ -0,0 +1,30 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +define('PHPUNIT_RUN', 1); + +require_once __DIR__.'/../../../lib/base.php'; + +\OC_App::loadApp('previewgenerator'); + +OC_Hook::clear(); diff --git a/ncp-previewgenerator/tests/phpunit.xml b/ncp-previewgenerator/tests/phpunit.xml new file mode 100644 index 00000000..ca916756 --- /dev/null +++ b/ncp-previewgenerator/tests/phpunit.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" ?> +<phpunit bootstrap="bootstrap.php" + verbose="true" + timeoutForSmallTests="900" + timeoutForMediumTests="900" + timeoutForLargeTests="900" +> + <testsuite name='Preview generator tests'> + <directory suffix='Test.php'>.</directory> + </testsuite> + <!-- filters for code coverage --> + <filter> + <whitelist> + <directory suffix=".php">../</directory> + <exclude> + <directory suffix=".php">../tests</directory> + </exclude> + </whitelist> + </filter> + <logging> + <!-- and this is where your report will be written --> + <log type="coverage-clover" target="./clover.xml"/> + </logging> +</phpunit> @@ -136,6 +136,11 @@ chmod 770 /var/www/ncp-web rm -rf /var/www/ncp-app cp -r ncp-app /var/www/ +# install ncp-previewgenerator +rm -rf /var/www/ncp-previewgenerator +cp -r ncp-previewgenerator /var/www/ +chown -R www-data: /var/www/ncp-previewgenerator + # copy NC app to nextcloud directory and enable it rm -rf /var/www/nextcloud/apps/nextcloudpi cp -r /var/www/ncp-app /var/www/nextcloud/apps/nextcloudpi diff --git a/updates/1.19.0.sh b/updates/1.19.0.sh new file mode 100644 index 00000000..e7b88a39 --- /dev/null +++ b/updates/1.19.0.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e + +## BACKWARD FIXES ( for older images ) + +source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE + +# all images + +# replace preview generator for the NCP version +[[ -d /var/www/nextcloud/apps/previewgenerator ]] && { + grep -q NCP /var/www/nextcloud/apps/previewgenerator &>/dev/null || { + cp -raT /var/www/nextcloud/apps/{previewgenerator,previewgenerator.orig} + cp -r /var/www/ncp-previewgenerator /var/www/nextcloud/apps/previewgenerator + chown -R www-data: /var/www/nextcloud/apps/previewgenerator + is_active_app nc-previews-auto && run_app nc-previews-auto + } +} + +# docker images only +[[ -f /.docker-image ]] && { + : +} + +# for non docker images +[[ ! -f /.docker-image ]] && { + : +} + +exit 0 |