wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
21523 commits 157 branches 562 tags 714 MiB
Commit graph

68 commits

Author SHA1 Message Date
Olivier Paroz
93a6cc17a5 The class name is Movie NOT Movies 2014-11-25 11:35:38 +01:00
Morris Jobke
168fce0b18 Merge pull request #12303 from owncloud/windows-unknown-command-command 
Deduplicate findBinaryPath() and do not try "command -v" on windows
 2014-11-24 14:03:07 +01:00
Georg Ehrke
45d985f2d8 remove ugly hack and don't use OC\Preview\Image for tiffs and svgs 2014-11-23 19:11:03 +01:00
Joas Schilling
d15f1882f9 Simplify the binary finding code in the movie preview class 2014-11-20 12:41:55 +01:00
Joas Schilling
64421d76fd Deduplicate function by moving it to the OC_Helper 2014-11-20 12:37:59 +01:00
Olivier Paroz
cb118ce371 Replace deprecated switches 
Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
 2014-11-18 15:04:01 +01:00
Morris Jobke
a6293a38f2 Merge pull request #11390 from Nemesiz/master 
Preview large TXT files fix
 2014-10-06 14:25:27 +02:00
Olivier Paroz
b0000800e1 New generic class for Imagemagick conversions 2014-10-04 17:50:12 +02:00
Nmz
83c2829ca8 Preview large TXT files fix 
Limit the size of the string generating the preview image for TXT files
 2014-10-02 12:47:39 +03:00
Lukas Reschke
ca3447fcde Add a configuration switch for enabled preview mimetypes 2014-09-22 16:09:08 +02:00
Lukas Reschke
ef0a0f5f87 Merge pull request #9554 from owncloud/fix_preview_orientation 
fix orientation in image-backend, not in preview system itself
 2014-09-17 17:05:47 +02:00
Lukas Reschke
5de404eb92 Merge pull request #10827 from oparoz/patch-2 
Libreoffice config folder needs to be set
 2014-09-08 16:41:26 +02:00
Olivier Paroz
bbc2d7cf4f Typ in whichOpenOffice test 2014-09-04 12:54:20 +02:00
Olivier Paroz
eaab067716 env:UserInstallation was already there in master 
My changes were made against stable7 and I merged them to the file in master, so this version is now the properly merged file for master.
I'm just adding `owncloud-<instanceid>` to the path where temp files are stored.
 2014-09-03 16:08:40 +02:00
Olivier Paroz
3bf155e138 This is not a PDF, there are no pages 2014-09-03 12:32:59 +02:00
Olivier Paroz
0c3c72aec0 Libreoffice config folder needs to be set 
In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance.

Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353), I propose to use /tmp/owncloud-instanceid
 2014-09-03 03:12:35 +02:00
Olivier Paroz
b559b21dc3 Converts TIFF files to PNG 2014-09-02 22:56:39 +02:00
Morris Jobke
b6a2a85bb8 Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf 
implement a txt preview fallback for the case that ttf is not support
 2014-08-07 22:55:06 +02:00
Robin Appelman
4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Georg Ehrke
4e8e69dc81 implement a txt preview fallback for the case that ttf is not support 2014-07-28 13:05:08 +02:00
Thomas Müller
539d2b7ec3 Merge pull request #9784 from josh4trunks/libreoffice_match_cl 
Cleanup Document Preview
 2014-07-28 13:03:33 +02:00
Morris Jobke
ae3761f15d add autoload 2014-07-25 17:37:33 +02:00
Morris Jobke
a9666c4f5b update getID3 library 2014-07-25 15:25:45 +02:00
josh4trunks
acd5660492 Cleanup Document Preview 
Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php.
This will stop the creating of multiple directories for document conversion in tmpDir.
 2014-07-22 22:46:38 -07:00
Georg Ehrke
380aacdf93 fix orientation in image-backend, not in preview system itself 2014-07-09 23:07:58 +02:00
Morris Jobke
35f7565e9b Merge pull request #8978 from owncloud/movie_preview_improvements 
movie previews: use file directly when it's stored locally and encryption is not enabled
 2014-06-14 01:01:59 +02:00
Georg Ehrke
7396e5f455 movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756 2014-06-10 22:08:27 +02:00
Georg Ehrke
e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Thomas Müller
da0e37ef03 Rotate thumbnail when encryption is enabled 
When a picture is encrypted, save it to a temporary file first so that
the PHP function for rotation can access it as file.
 2014-05-12 11:27:39 +02:00
Thomas Müller
20893cc3b3 Images on public sharing get downscaled to increase use experience - this will speed up loading time 
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
 2014-05-02 17:02:57 +02:00
Georg Ehrke
b68098ebba remove preview office fallback as it makes too much trouble and generates inacceptable results 2014-04-28 12:05:10 +02:00
Thomas Müller
a4389340b8 escape $second + update PHPDoc 2014-04-16 19:45:55 +02:00
Thomas Müller
d0f8cc20c5 videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second 2014-04-16 17:16:03 +02:00
Georg Ehrke
eb5265b106 fix merge conflicts 2014-03-06 11:55:45 +01:00
Georg Ehrke
dbf83aada2 fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case 2014-03-05 15:57:45 +01:00
Philipp Schmitt
43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +01:00
Thomas Müller
9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
Georg Ehrke
f62f1658ce suppress error msg caused by php bug 2014-02-14 11:23:39 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Georg Ehrke
d55ef442cd properly check if pdf and svg modules are installed 2014-02-04 12:59:14 +01:00
Thomas Müller
07a84aa5eb reuse existing helper function OC_Helper::is_function_enabled 2014-01-07 14:52:18 +01:00
Thomas Müller
14e7075030 we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB. 
in some cases 1MB was no enough to generate thumbnail
 2013-11-22 12:23:22 +01:00
Thomas Müller
c22019dec5 Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that 2013-11-22 12:20:06 +01:00
Morris Jobke
926b274200 Movie preview - use frame after 5 seconds 2013-11-15 01:46:51 +01:00
Thomas Müller
617dc0e468 Merge branch 'master' into moviepreviewfallback 
Conflicts:
	lib/private/preview/movies.php
 2013-11-14 20:57:29 +01:00
Thomas Tanghus
ec51825d31 Use dedicated OC_Image loader methods 
This prevents excessive logging and disk access
 2013-11-13 00:36:42 +01:00
Vincent Petry
99ee95d46c Added missing escaping 2013-11-11 15:41:03 +01:00
Vincent Petry
df288605d4 Fixed undefined variable error when using avconv 2013-11-10 11:46:46 +01:00
Vincent Petry
4b5083e3ca Fixed the rebellous space, replaced with a tab 2013-11-08 12:27:53 +01:00
Vincent Petry
0c6af55112 Added ffmpeg fallback when avconv is not available 
On some distros, avconv isn't available yet.
This fix adds a fallback to ffmpeg.
When none is found, no error message is displayed in the console any
more.

Fixes #5745

Also, this now uses exec() instead of shell_exec() to be able to get the
return code.

The binary path found with "which" is now used to prevent further FS
binary lookup when running the commands.

Moved the "-ss" parameter before "-i" for ffmpeg.
 2013-11-08 12:19:32 +01:00