Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Raw files previews #13652

Closed
wants to merge 1 commit into from
Closed

Add support for Raw files previews #13652

wants to merge 1 commit into from

Conversation

oparoz
Copy link
Contributor

@oparoz oparoz commented Jan 24, 2015

Solution for

#13650
owncloud-archive/apps#439
owncloud-archive/apps#1113

Supported formats:

  • Sony Alpha RAW .arw
  • Canon RAW 2 .cr2
  • Digital Camera Raw .dcr
  • Digital Negative .dng
  • EPSON RAW .erf
  • Intelligent Image Quality RAW .iiq
  • Kodak DC40/DC50 RAW .kdc
  • Kodak DC25 RAW .k25
  • Nikon RAW .nef
  • Mamiya RAW .mef
  • Olympus RAW .orf
  • Panasonic RAW .rw2
  • PENTAX RAW .pef
  • Fujifilm RAW .raf
  • Sony RAW File .srf .sr2
  • SIGMA RAW .xrf

Requirements

public function getMimeType() {
return '/image\/x-dcraw/';
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

@oparoz
Copy link
Contributor Author

oparoz commented Feb 11, 2015

Excellent website with samples to test with
http://www.rawsamples.ch/

@oparoz
Copy link
Contributor Author

oparoz commented Feb 12, 2015

Looking at https://ci.owncloud.org/job/pull-request-analyser-ng-simple/9268/label=SLAVE/console , I don't think the repair tests were executed.

@LukasReschke LukasReschke changed the title Add support for Raw files previews [WIP] Add support for Raw files previews Feb 24, 2015
@@ -13,7 +13,7 @@ class Image extends Provider {
* {@inheritDoc}
*/
public function getMimeType() {
return '/image\/(?!tiff$)(?!svg.*).*/';
return '/image\/(?!x-dcraw$)(?!tiff$)(?!svg.*).*/';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks wrong to me.
Seems to only work for svg as intended: https://regex101.com/r/qQ4bO5/1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to test one at a time (like the Preview class does) and you should see that it works.

@oparoz oparoz changed the title [WIP] Add support for Raw files previews Add support for Raw files previews Feb 24, 2015
@MorrisJobke
Copy link
Contributor

@DeepDiver1975 @nickvergessen Same as in #13648 (comment) ?

@@ -190,5 +214,9 @@ public function run() {
if ($this->fixPostscriptMimeType()) {
$this->emit('\OC\Repair', 'info', array('Fixed Postscript mime types'));
}

if ($this->introduceRawMimeType()) {
$this->emit('\OC\Repair', 'info', array('Fixed Postscript mime types'));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy and paste error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good eye :)

@MorrisJobke
Copy link
Contributor

@owncloud-bot retest this please

@ghost
Copy link

ghost commented Mar 11, 2015

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/10375/

Build result: FAILURE

[...truncated 13 lines...] > git config --local --remove-section credential # timeout=10 > git config remote.origin.url https://github.com/owncloud/core.git # timeout=10 > git config --add remote.origin.fetch +refs/heads/:refs/remotes/origin/ # timeout=10 > git config remote.origin.url https://github.com/owncloud/core.git # timeout=10Fetching upstream changes from https://github.com/owncloud/core.gitusing GIT_SSH to set credentials using .gitcredentials to set credentials > git config --local credential.helper store --file=/tmp/git4157415401091231901.credentials # timeout=10 > git -c core.askpass=true fetch --tags --progress https://github.com/owncloud/core.git +refs/pull/:refs/remotes/origin/pr/ > git config --local --remove-section credential # timeout=10 > git rev-parse refs/remotes/origin/pr/13652/merge^{commit} # timeout=10 > git rev-parse refs/remotes/origin/origin/pr/13652/merge^{commit} # timeout=10Checking out Revision b475b157dcaa1f99b826c0a71429254e2cd88761 (refs/remotes/origin/pr/13652/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f b475b157dcaa1f99b826c0a71429254e2cd88761 > git rev-list b475b157dcaa1f99b826c0a71429254e2cd88761 # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveTriggering pull-request-analyser-ng-simple » SLAVEpull-request-analyser-ng-simple » SLAVE completed with result FAILURESetting status of 20ff83b3c60257a5234953de28f1d9dd3fdc9053 to FAILURE with url https://ci.owncloud.org/job/pull-request-analyser-ng-simple/10375/ and message: Merged build finished.
Test FAILed.

@oparoz
Copy link
Contributor Author

oparoz commented Mar 13, 2015

Failing tests are unrelated

@nickvergessen
Copy link
Contributor

@owncloud-bot retest this please

@ghost
Copy link

ghost commented Mar 13, 2015

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/10427/

Build result: FAILURE

[...truncated 14 lines...] > git config remote.origin.url https://github.com/owncloud/core.git # timeout=10 > git config --add remote.origin.fetch +refs/heads/:refs/remotes/origin/ # timeout=10 > git config remote.origin.url https://github.com/owncloud/core.git # timeout=10Fetching upstream changes from https://github.com/owncloud/core.gitusing GIT_SSH to set credentials using .gitcredentials to set credentials > git config --local credential.helper store --file=/tmp/git3833776074722769109.credentials # timeout=10 > git -c core.askpass=true fetch --tags --progress https://github.com/owncloud/core.git +refs/pull/:refs/remotes/origin/pr/ > git config --local --remove-section credential # timeout=10 > git rev-parse refs/remotes/origin/pr/13652/merge^{commit} # timeout=10 > git rev-parse refs/remotes/origin/origin/pr/13652/merge^{commit} # timeout=10Checking out Revision 2cf5304d247199328ef4701bcfe40c46cc19762e (refs/remotes/origin/pr/13652/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 2cf5304d247199328ef4701bcfe40c46cc19762e > git rev-list b475b157dcaa1f99b826c0a71429254e2cd88761 # timeout=10First time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveTriggering pull-request-analyser-ng-simple » SLAVEpull-request-analyser-ng-simple » SLAVE completed with result FAILURESetting status of 20ff83b3c60257a5234953de28f1d9dd3fdc9053 to FAILURE with url https://ci.owncloud.org/job/pull-request-analyser-ng-simple/10427/ and message: Merged build finished.
Test FAILed.

Including media type migration and tests

Solutions for
#13650
owncloud-archive/apps#439
owncloud-archive/apps#1113

Supported formats:
Sony Alpha RAW .arw
Canon RAW 2 .cr2
Digital Camera Raw .dcr
Digital Negative .dng
EPSON RAW .erf
Intelligent Image Quality RAW .iiq
Kodak DC40/DC50 RAW .kdc
Kodak DC25 RAW .k25
Nikon RAW .nef
Mamiya RAW .mef
Olympus RAW .orf
Panasonic RAW .rw2
PENTAX RAW .pef
Fujifilm RAW .raf
Sony RAW File .srf .sr2
SIGMA RAW .xrf
@scrutinizer-notifier
Copy link

A new inspection was created.

@ghost
Copy link

ghost commented Mar 13, 2015

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/10436/

Build result: FAILURE

[...truncated 14 lines...] > git config remote.origin.url https://github.com/owncloud/core.git # timeout=10 > git config --add remote.origin.fetch +refs/heads/:refs/remotes/origin/ # timeout=10 > git config remote.origin.url https://github.com/owncloud/core.git # timeout=10Fetching upstream changes from https://github.com/owncloud/core.gitusing GIT_SSH to set credentials using .gitcredentials to set credentials > git config --local credential.helper store --file=/tmp/git4232959675771617654.credentials # timeout=10 > git -c core.askpass=true fetch --tags --progress https://github.com/owncloud/core.git +refs/pull/:refs/remotes/origin/pr/ > git config --local --remove-section credential # timeout=10 > git rev-parse refs/remotes/origin/pr/13652/merge^{commit} # timeout=10 > git rev-parse refs/remotes/origin/origin/pr/13652/merge^{commit} # timeout=10Checking out Revision a64013628ec81fe8886cff6ad709e4d4ae58cb72 (refs/remotes/origin/pr/13652/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f a64013628ec81fe8886cff6ad709e4d4ae58cb72 > git rev-list 2cf5304d247199328ef4701bcfe40c46cc19762e # timeout=10First time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveTriggering pull-request-analyser-ng-simple » SLAVEpull-request-analyser-ng-simple » SLAVE completed with result FAILURESetting status of d0d9a1f to FAILURE with url https://ci.owncloud.org/job/pull-request-analyser-ng-simple/10436/ and message: Merged build finished.
Test FAILed.

@oparoz
Copy link
Contributor Author

oparoz commented Mar 13, 2015

So why can't the bot even merge this PR?

@LukasReschke
Copy link
Member

Bug in the CI plugin. Either retry or if that does not work create a new PR :-(

@oparoz
Copy link
Contributor Author

oparoz commented Mar 13, 2015

;(

I just did a rebase and it failed, so I guess I'll have to create a fresh one... Thanks!

@nickvergessen
Copy link
Contributor

I just did a rebase and it failed, so I guess I'll have to create a fresh one... Thanks!

Before pushing again to a branch, make sure to wait until jenkins reported back

@oparoz
Copy link
Contributor Author

oparoz commented Mar 13, 2015

Yep. I noticed yesterday that my default setting for push was not set to simple, so sometimes, changes were pushed to side branches as well, killing jenkins in the process if he was already looking at that branch.

So if that every happens, then it just kills the branch?

@scrutinizer-notifier
Copy link

The inspection completed: 2 new issues, 4 updated code elements

@MorrisJobke
Copy link
Contributor

@oparoz You can simply close this PR and open a new one without deleting the branch - everything right on github. This should solve the Jenkins plugin problem ;)

@oparoz oparoz closed this Mar 13, 2015
@MorrisJobke MorrisJobke removed this from the 8.1-current milestone Mar 13, 2015
@oparoz
Copy link
Contributor Author

oparoz commented Mar 13, 2015

New PR #14878
Let's hope this works

@MorrisJobke
Copy link
Contributor

@oparoz
Copy link
Contributor Author

oparoz commented Mar 13, 2015

😌

@lock lock bot locked as resolved and limited conversation to collaborators Aug 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants