hydra-works 0.17.0 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -1
- data/.rubocop.yml +1 -0
- data/.travis.yml +2 -2
- data/CHANGELOG.md +621 -0
- data/CODE_OF_CONDUCT.md +36 -0
- data/CONTRIBUTING.md +23 -21
- data/LICENSE +14 -16
- data/README.md +28 -1
- data/SUPPORT.md +5 -0
- data/hydra-works.gemspec +10 -9
- data/lib/hydra/works/characterization.rb +5 -4
- data/lib/hydra/works/characterization/fits_document.rb +22 -8
- data/lib/hydra/works/characterization/schema/audio_schema.rb +2 -0
- data/lib/hydra/works/characterization/schema/video_schema.rb +2 -0
- data/lib/hydra/works/services/add_external_file_to_file_set.rb +1 -1
- data/lib/hydra/works/services/add_file_to_file_set.rb +1 -1
- data/lib/hydra/works/version.rb +1 -1
- data/spec/fixtures/fits_1.2.0_avi.xml +83 -0
- data/spec/fixtures/fits_1.2.0_jpg.xml +76 -0
- data/spec/fixtures/fits_1.2.0_mp3.xml +51 -0
- data/spec/fixtures/fits_1.2.0_mp4.xml +88 -0
- data/spec/hydra/works/characterization_spec.rb +12 -5
- data/spec/hydra/works/models/collection_spec.rb +12 -0
- data/spec/hydra/works/models/concerns/file_set/contained_files_spec.rb +3 -16
- data/spec/hydra/works/services/characterization_service_spec.rb +70 -26
- data/use-cases/princeton_book_use_case.md +1 -1
- metadata +66 -35
data/CODE_OF_CONDUCT.md
ADDED
@@ -0,0 +1,36 @@
|
|
1
|
+
The Samvera community is dedicated to providing a welcoming and
|
2
|
+
positive experience for all its members, whether they are at a formal
|
3
|
+
gathering, in a social setting, or taking part in activities online.
|
4
|
+
The Samvera community welcomes participation from people all over the
|
5
|
+
world and these members bring with them a wide variety of
|
6
|
+
professional, personal and social backgrounds; whatever these may be,
|
7
|
+
we treat colleagues with dignity and respect.
|
8
|
+
|
9
|
+
Community members communicate primarily in English, though for many of
|
10
|
+
them this is not their native language. We therefore strive to express
|
11
|
+
ourselves simply and clearly remembering that unnecessary use of
|
12
|
+
jargon and slang will be a barrier to understanding for many of our
|
13
|
+
colleagues. We are sensitive to the fact that the international
|
14
|
+
nature of the community means that we span many different social norms
|
15
|
+
around language and behaviour and we strive to conduct ourselves,
|
16
|
+
online and in person, in ways that are unlikely to cause offence.
|
17
|
+
|
18
|
+
Samvera conversations are often information-rich and intended to
|
19
|
+
generate discussion and debate. We discuss ideas from a standpoint of
|
20
|
+
mutual respect and reasoned argument.
|
21
|
+
|
22
|
+
Community members work together to promote a respectful and safe
|
23
|
+
community. In the event that someone’s conduct is causing offence or
|
24
|
+
distress, Samvera has a detailed
|
25
|
+
[Anti-Harassment Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
|
26
|
+
which can be applied to address the problem. The first step in dealing
|
27
|
+
with any serious misconduct is to contact a local meeting organizer,
|
28
|
+
the
|
29
|
+
[Samvera community helpers](https://wiki.duraspace.org/display/samvera/Samvera+Community+Helpers)
|
30
|
+
([email](mailto:helpers@samvera.org)), a community member you
|
31
|
+
trust, or the
|
32
|
+
[Samvera Steering Group](https://wiki.duraspace.org/display/samvera/Samvera+Steering+Group+membership)
|
33
|
+
immediately; at Samvera events, these people can be identified by
|
34
|
+
distinctive name badges. The
|
35
|
+
[Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
|
36
|
+
should be consulted for fuller details.
|
data/CONTRIBUTING.md
CHANGED
@@ -1,21 +1,24 @@
|
|
1
1
|
# How to Contribute
|
2
2
|
|
3
|
-
We want your help to make
|
4
|
-
|
3
|
+
We want your help to make the Samvera community great. There are a few guidelines
|
4
|
+
that we need contributors to follow so that we can have a chance of
|
5
|
+
keeping on top of things.
|
5
6
|
|
6
7
|
## Code of Conduct
|
7
8
|
|
8
|
-
The
|
9
|
-
members, whether they are at a formal gathering, in
|
10
|
-
online.
|
11
|
-
for more information.
|
9
|
+
The Samvera Community is dedicated to providing a welcoming and positive
|
10
|
+
experience for all its members, whether they are at a formal gathering, in
|
11
|
+
a social setting, or taking part in activities online. Please see our
|
12
|
+
[Code of Conduct](CODE_OF_CONDUCT.md) for more information.
|
12
13
|
|
13
|
-
##
|
14
|
+
## Samvera Community Intellectual Property Licensing and Ownership
|
14
15
|
|
15
|
-
All code contributors must have an Individual Contributor License Agreement
|
16
|
-
|
16
|
+
All code contributors must have an Individual Contributor License Agreement
|
17
|
+
(iCLA) on file with the Samvera Steering Group. If the contributor works for
|
18
|
+
an institution, the institution must have a Corporate Contributor License
|
19
|
+
Agreement (cCLA) on file.
|
17
20
|
|
18
|
-
https://wiki.duraspace.org/display/
|
21
|
+
https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
|
19
22
|
|
20
23
|
You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
|
21
24
|
|
@@ -31,7 +34,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
|
|
31
34
|
### Reporting Issues
|
32
35
|
|
33
36
|
* Make sure you have a [GitHub account](https://github.com/signup/free)
|
34
|
-
* Submit a [Github issue](
|
37
|
+
* Submit a [Github issue](https://github.com/samvera/hydra-works/issues/) by:
|
35
38
|
* Clearly describing the issue
|
36
39
|
* Provide a descriptive summary
|
37
40
|
* Explain the expected behavior
|
@@ -48,7 +51,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
|
|
48
51
|
* Please avoid working directly on the `master` branch.
|
49
52
|
* You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
|
50
53
|
* Make sure you have added sufficient tests and documentation for your changes.
|
51
|
-
* Test functionality with RSpec;
|
54
|
+
* Test functionality with RSpec; Test features / UI with Capybara.
|
52
55
|
* Run _all_ the tests to assure nothing else was accidentally broken.
|
53
56
|
|
54
57
|
### Documenting Code
|
@@ -60,15 +63,11 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
|
|
60
63
|
* If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
|
61
64
|
* This work greatly increases the usability of the code base and supports the on-ramping of new committers.
|
62
65
|
* We will all be understanding of one another's time constraints in this area.
|
63
|
-
* YARD examples:
|
64
|
-
* [Hydra::Works::RemoveGenericFile](https://github.com/projecthydra-labs/hydra-works/blob/master/lib/hydra/works/services/generic_work/remove_generic_file.rb)
|
65
|
-
* [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb)
|
66
66
|
* [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
|
67
67
|
|
68
68
|
### Committing changes
|
69
69
|
|
70
70
|
* Make commits of logical units.
|
71
|
-
* Your commit should include a high level description of your work in HISTORY.textile
|
72
71
|
* Check for unnecessary whitespace with `git diff --check` before committing.
|
73
72
|
* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
|
74
73
|
* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
|
@@ -103,6 +102,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
|
|
103
102
|
long to fit in 72 characters
|
104
103
|
```
|
105
104
|
|
105
|
+
* Make sure you have added the necessary tests for your changes.
|
106
|
+
* Run _all_ the tests to assure nothing else was accidentally broken.
|
107
|
+
* When you are ready to submit a pull request
|
108
|
+
|
106
109
|
### Submitting Changes
|
107
110
|
|
108
111
|
* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
|
@@ -125,9 +128,7 @@ We adopted [Github's Pull Request Review](https://help.github.com/articles/about
|
|
125
128
|
Common checks that may occur in our repositories:
|
126
129
|
|
127
130
|
1. Travis CI - where our automated tests are running
|
128
|
-
2.
|
129
|
-
3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
|
130
|
-
4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
|
131
|
+
2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
|
131
132
|
|
132
133
|
If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
|
133
134
|
|
@@ -144,16 +145,17 @@ First, the person contributing the code is putting themselves out there. Be mind
|
|
144
145
|
This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider:
|
145
146
|
|
146
147
|
* Does the commit message explain what is going on?
|
147
|
-
* Does the code changes have tests? _Not all changes need new tests, some changes are
|
148
|
+
* Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
|
148
149
|
* Do new or changed methods, modules, and classes have documentation?
|
149
150
|
* Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
|
150
151
|
* Does the description of the new/changed specs match your understanding of what the spec is doing?
|
152
|
+
* Did the Travis tests complete successfully?
|
151
153
|
|
152
154
|
If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
|
153
155
|
|
154
156
|
# Additional Resources
|
155
157
|
|
156
158
|
* [General GitHub documentation](http://help.github.com/)
|
157
|
-
* [GitHub pull request documentation](
|
159
|
+
* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
|
158
160
|
* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
|
159
161
|
* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)
|
data/LICENSE
CHANGED
@@ -1,16 +1,14 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
# See the License for the specific language governing permissions and
|
16
|
-
# limitations under the License.
|
1
|
+
Copyright 2014 University of Notre Dame, Northwestern University, and Data Curation Experts
|
2
|
+
Additional copyright may be held by others, as reflected in the commit history.
|
3
|
+
|
4
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
+
you may not use this file except in compliance with the License.
|
6
|
+
You may obtain a copy of the License at
|
7
|
+
|
8
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
|
10
|
+
Unless required by applicable law or agreed to in writing, software
|
11
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
+
See the License for the specific language governing permissions and
|
14
|
+
limitations under the License.
|
data/README.md
CHANGED
@@ -8,7 +8,27 @@
|
|
8
8
|
[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
|
9
9
|
[![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/hydra-works)
|
10
10
|
|
11
|
-
|
11
|
+
Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
|
12
|
+
|
13
|
+
# What is hydra-works?
|
14
|
+
The Hydra::Works gem implements the [PCDM](https://github.com/duraspace/pcdm/wiki) [Works](https://github.com/duraspace/pcdm/blob/master/pcdm-ext/works.rdf) data model using ActiveFedora-based models. In addition to the models, Hydra::Works includes associated behaviors around the broad concept of describable "works" or intellectual entities, the need for which was expressed by a variety of [Samvera community use cases](https://github.com/samvera/hydra-works/tree/master/use-cases).
|
15
|
+
|
16
|
+
## Product Owner & Maintenance
|
17
|
+
|
18
|
+
hydra-works is a Core Component of the Samvera community. The documentation for
|
19
|
+
what this means can be found
|
20
|
+
[here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
|
21
|
+
|
22
|
+
### Product Owner
|
23
|
+
|
24
|
+
[mark-dce](https://github.com/mark-dce)
|
25
|
+
|
26
|
+
# Help
|
27
|
+
|
28
|
+
The Samvera community is here to help. Please see our [support guide](./SUPPORT.md).
|
29
|
+
|
30
|
+
# Getting Started
|
31
|
+
The PCDM Works domain model includes the following high-level entities:
|
12
32
|
|
13
33
|
* **Collection**: a *pcdm:Collection* that indirectly contains zero or more **Works** and zero or more **Collection**s
|
14
34
|
* **Work**: a *pcdm:Object* that holds zero or more **FileSets** and zero or more **Works**
|
@@ -127,3 +147,10 @@ is installed, run:
|
|
127
147
|
```bash
|
128
148
|
rake works:spec
|
129
149
|
```
|
150
|
+
|
151
|
+
# Acknowledgments
|
152
|
+
|
153
|
+
This software has been developed by and is brought to you by the Samvera community. Learn more at the
|
154
|
+
[Samvera website](http://samvera.org/).
|
155
|
+
|
156
|
+
![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
|
data/SUPPORT.md
ADDED
@@ -0,0 +1,5 @@
|
|
1
|
+
If you would like to report an issue, first search [the list of issues](https://github.com/samvera/hydra-works/issues/) to see if someone else has already reported it, and then feel free to [create a new issue](https://github.com/samvera/hydra-works/issues/new).
|
2
|
+
i
|
3
|
+
If you have questions or need help, please email [the Samvera community tech list](https://groups.google.com/forum/#!forum/samvera-tech) or stop by the #dev channel in [the Samvera community Slack team](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack).
|
4
|
+
|
5
|
+
You can learn more about the various Samvera communication channels on the [Get in touch!](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391) wiki page.
|
data/hydra-works.gemspec
CHANGED
@@ -9,27 +9,28 @@ Gem::Specification.new do |spec|
|
|
9
9
|
spec.version = Hydra::Works::VERSION
|
10
10
|
spec.authors = ['Justin Coyne']
|
11
11
|
spec.email = ['justin@curationexperts.com']
|
12
|
-
spec.summary = %q{Fundamental repository data model for
|
13
|
-
spec.description = %q{Using this data model should enable easy collaboration amongst
|
14
|
-
spec.homepage = 'https://github.com/
|
12
|
+
spec.summary = %q{Fundamental repository data model for Samvera applications}
|
13
|
+
spec.description = %q{Using this data model should enable easy collaboration amongst Samvera projects.}
|
14
|
+
spec.homepage = 'https://github.com/samvera/hydra-works'
|
15
15
|
spec.license = 'APACHE2'
|
16
16
|
|
17
|
-
spec.files = `git ls-files -z`.split("\x0") - DO_NOT_SHIP
|
17
|
+
spec.files = `git ls-files -z`.split("\x0") - DO_NOT_SHIP
|
18
18
|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
19
19
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
20
20
|
spec.require_paths = ['lib']
|
21
21
|
|
22
|
-
spec.add_dependency '
|
22
|
+
spec.add_dependency 'activesupport', '>= 4.2.10', '< 5.2'
|
23
23
|
spec.add_dependency 'hydra-derivatives', '~> 3.0'
|
24
24
|
spec.add_dependency 'hydra-file_characterization', '~> 0.3', '>= 0.3.3'
|
25
|
+
spec.add_dependency 'hydra-pcdm', '>= 0.9'
|
25
26
|
spec.add_dependency 'om', '~> 3.1'
|
26
27
|
|
27
28
|
spec.add_development_dependency 'bundler', '~> 1.7'
|
29
|
+
spec.add_development_dependency 'coveralls'
|
30
|
+
spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
|
28
31
|
spec.add_development_dependency 'rake', '~> 10.0'
|
32
|
+
spec.add_development_dependency 'rspec'
|
29
33
|
spec.add_development_dependency 'rspec-rails', '~> 3.1'
|
30
|
-
spec.add_development_dependency 'sqlite3'
|
31
34
|
spec.add_development_dependency 'solr_wrapper', '~> 0.4'
|
32
|
-
spec.add_development_dependency '
|
33
|
-
spec.add_development_dependency 'coveralls'
|
34
|
-
spec.add_development_dependency 'rspec'
|
35
|
+
spec.add_development_dependency 'sqlite3'
|
35
36
|
end
|
@@ -9,10 +9,11 @@ module Hydra::Works
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def mapper_defaults
|
12
|
-
{
|
13
|
-
|
14
|
-
video_audio_sample_rate: :sample_rate,
|
15
|
-
video_sample_rate: :sample_rate,
|
12
|
+
{ file_author: :creator, file_language: :language, file_mime_type: :mime_type,
|
13
|
+
audio_duration: :duration, audio_sample_rate: :sample_rate, audio_bit_rate: :bit_rate,
|
14
|
+
video_audio_sample_rate: :sample_rate, track_frame_rate: :frame_rate,
|
15
|
+
video_duration: :duration, video_sample_rate: :sample_rate, video_bit_rate: :bit_rate,
|
16
|
+
video_width: :width, video_track_width: :width, video_height: :height, video_track_height: :height }
|
16
17
|
end
|
17
18
|
end
|
18
19
|
|
@@ -23,7 +23,7 @@ module Hydra::Works::Characterization
|
|
23
23
|
t.last_modified(path: 'lastmodified', attributes: { toolname: "Exiftool" })
|
24
24
|
t.filename(path: 'filename')
|
25
25
|
t.original_checksum(path: 'md5checksum')
|
26
|
-
t.date_created(path: 'created')
|
26
|
+
t.date_created(path: 'created', attributes: { toolname: "Exiftool" })
|
27
27
|
t.rights_basis(path: 'rightsBasis')
|
28
28
|
t.copyright_basis(path: 'copyrightBasis')
|
29
29
|
t.copyright_note(path: 'copyrightNote')
|
@@ -59,7 +59,7 @@ module Hydra::Works::Characterization
|
|
59
59
|
t.image_producer(path: 'imageProducer')
|
60
60
|
t.capture_device(path: 'captureDevice')
|
61
61
|
t.scanning_software(path: 'scanningSoftwareName')
|
62
|
-
t.exif_version(path: 'exifVersion')
|
62
|
+
t.exif_version(path: 'exifVersion', attributes: { toolname: "Exiftool" })
|
63
63
|
t.gps_timestamp(path: 'gpsTimeStamp')
|
64
64
|
t.latitude(path: 'gpsDestLatitude')
|
65
65
|
t.longitude(path: 'gpsDestLongitude')
|
@@ -72,18 +72,26 @@ module Hydra::Works::Characterization
|
|
72
72
|
t.audio do
|
73
73
|
t.duration(path: 'duration')
|
74
74
|
t.bit_depth(path: 'bitDepth')
|
75
|
+
t.bit_rate(path: 'bitRate')
|
75
76
|
t.sample_rate(path: 'sampleRate')
|
76
77
|
t.channels(path: 'channels')
|
77
78
|
t.data_format(path: 'dataFormatType')
|
78
79
|
t.offset(path: 'offset')
|
79
80
|
end
|
80
81
|
t.video do
|
81
|
-
t.width(path: 'imageWidth')
|
82
|
-
t.height(path: 'imageHeight')
|
82
|
+
t.width(path: 'imageWidth') # for fits_0.8.5
|
83
|
+
t.height(path: 'imageHeight') # for fits_0.8.5
|
83
84
|
t.duration(path: 'duration')
|
84
|
-
t.
|
85
|
-
t.
|
86
|
-
t.
|
85
|
+
t.bit_rate(path: 'bitRate') # for fits_1.2.0
|
86
|
+
t.sample_rate(path: 'sampleRate') # for fits_0.8.5
|
87
|
+
t.audio_sample_rate(path: 'audioSampleRate') # for fits_0.8.5
|
88
|
+
t.frame_rate(path: 'frameRate') # for fits_0.8.5
|
89
|
+
t.track(path: 'track', attributes: { type: 'video' }) do # for fits_1.2.0
|
90
|
+
t.width(path: 'width')
|
91
|
+
t.height(path: 'height')
|
92
|
+
t.aspect_ratio(path: 'aspectRatio')
|
93
|
+
t.frame_rate(path: 'frameRate')
|
94
|
+
end
|
87
95
|
end
|
88
96
|
end
|
89
97
|
# fits_version needs a different name than it's target node since they're at the same level
|
@@ -93,7 +101,7 @@ module Hydra::Works::Characterization
|
|
93
101
|
t.file_mime_type(proxy: [:identification, :identity, :mime_type])
|
94
102
|
t.exif_tool_version(proxy: [:identification, :identity, :tool, :exif_tool_version])
|
95
103
|
t.file_size(proxy: [:fileinfo, :file_size])
|
96
|
-
t.
|
104
|
+
t.date_modified(proxy: [:fileinfo, :last_modified])
|
97
105
|
t.filename(proxy: [:fileinfo, :filename])
|
98
106
|
t.original_checksum(proxy: [:fileinfo, :original_checksum])
|
99
107
|
t.date_created(proxy: [:fileinfo, :date_created])
|
@@ -117,8 +125,10 @@ module Hydra::Works::Characterization
|
|
117
125
|
t.compression(proxy: [:metadata, :image, :compression])
|
118
126
|
t.width(proxy: [:metadata, :image, :width])
|
119
127
|
t.video_width(proxy: [:metadata, :video, :width])
|
128
|
+
t.video_track_width(proxy: [:metadata, :video, :track, :width])
|
120
129
|
t.height(proxy: [:metadata, :image, :height])
|
121
130
|
t.video_height(proxy: [:metadata, :video, :height])
|
131
|
+
t.video_track_height(proxy: [:metadata, :video, :track, :height])
|
122
132
|
t.color_space(proxy: [:metadata, :image, :color_space])
|
123
133
|
t.profile_name(proxy: [:metadata, :image, :profile_name])
|
124
134
|
t.profile_version(proxy: [:metadata, :image, :profile_version])
|
@@ -144,6 +154,10 @@ module Hydra::Works::Characterization
|
|
144
154
|
t.data_format(proxy: [:metadata, :audio, :data_format])
|
145
155
|
t.offset(proxy: [:metadata, :audio, :offset])
|
146
156
|
t.frame_rate(proxy: [:metadata, :video, :frame_rate])
|
157
|
+
t.audio_bit_rate(proxy: [:metadata, :audio, :bit_rate])
|
158
|
+
t.video_bit_rate(proxy: [:metadata, :video, :bit_rate])
|
159
|
+
t.track_frame_rate(proxy: [:metadata, :video, :track, :frame_rate])
|
160
|
+
t.aspect_ratio(proxy: [:metadata, :video, :track, :aspect_ratio])
|
147
161
|
end
|
148
162
|
|
149
163
|
# Cleanup phase; ugly name to avoid collisions.
|
@@ -4,6 +4,8 @@ module Hydra::Works::Characterization
|
|
4
4
|
property :channels, predicate: RDF::Vocab::NFO.channels
|
5
5
|
property :data_format, predicate: RDF::Vocab::EBUCore.hasDataFormat
|
6
6
|
property :frame_rate, predicate: RDF::Vocab::NFO.frameRate
|
7
|
+
# bit_rate might be an array containing multiple values
|
8
|
+
property :bit_rate, predicate: RDF::Vocab::EBUCore.bitRate
|
7
9
|
property :duration, predicate: RDF::Vocab::NFO.duration
|
8
10
|
property :sample_rate, predicate: RDF::Vocab::EBUCore.sampleRate
|
9
11
|
# properties without cannonical URIs
|
@@ -3,7 +3,9 @@ module Hydra::Works::Characterization
|
|
3
3
|
property :height, predicate: RDF::Vocab::EBUCore.height
|
4
4
|
property :width, predicate: RDF::Vocab::EBUCore.width
|
5
5
|
property :frame_rate, predicate: RDF::Vocab::NFO.frameRate
|
6
|
+
property :bit_rate, predicate: RDF::Vocab::EBUCore.bitRate
|
6
7
|
property :duration, predicate: RDF::Vocab::NFO.duration
|
7
8
|
property :sample_rate, predicate: RDF::Vocab::EBUCore.sampleRate
|
9
|
+
property :aspect_ratio, predicate: RDF::Vocab::EBUCore.aspectRatio
|
8
10
|
end
|
9
11
|
end
|
@@ -15,7 +15,7 @@ module Hydra::Works
|
|
15
15
|
versioning = opts.fetch(:versioning, true)
|
16
16
|
filename = opts.fetch(:filename, external_file_url)
|
17
17
|
|
18
|
-
# TODO: required as a workaround for https://github.com/
|
18
|
+
# TODO: required as a workaround for https://github.com/samvera/active_fedora/pull/858
|
19
19
|
file_set.save unless file_set.persisted?
|
20
20
|
|
21
21
|
updater_class = versioning ? VersioningUpdater : Updater
|
@@ -11,7 +11,7 @@ module Hydra::Works
|
|
11
11
|
fail ArgumentError, 'supplied object must be a file set' unless file_set.file_set?
|
12
12
|
fail ArgumentError, 'supplied file must respond to read' unless file.respond_to? :read
|
13
13
|
|
14
|
-
# TODO: required as a workaround for https://github.com/
|
14
|
+
# TODO: required as a workaround for https://github.com/samvera/active_fedora/pull/858
|
15
15
|
file_set.save unless file_set.persisted?
|
16
16
|
|
17
17
|
updater_class = versioning ? VersioningUpdater : Updater
|
data/lib/hydra/works/version.rb
CHANGED
@@ -0,0 +1,83 @@
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
+
<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.2.0" timestamp="4/4/18 4:12 PM">
|
3
|
+
<identification status="CONFLICT">
|
4
|
+
<identity format="AVI" mimetype="video/avi" toolname="FITS" toolversion="1.2.0">
|
5
|
+
<tool toolname="MediaInfo" toolversion="0.7.75" />
|
6
|
+
</identity>
|
7
|
+
<identity format="Audio/Video Interleaved Format" mimetype="video/x-msvideo" toolname="FITS" toolversion="1.2.0">
|
8
|
+
<tool toolname="Droid" toolversion="6.3" />
|
9
|
+
<tool toolname="file utility" toolversion="5.31" />
|
10
|
+
<tool toolname="ffident" toolversion="0.2" />
|
11
|
+
<externalIdentifier toolname="Droid" toolversion="6.3" type="puid">fmt/5</externalIdentifier>
|
12
|
+
</identity>
|
13
|
+
</identification>
|
14
|
+
<fileinfo>
|
15
|
+
<filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/cjcolvar/Documents/Code/samvera/hydra-works/spec/fixtures/countdown.avi</filepath>
|
16
|
+
<filename toolname="MediaInfo" toolversion="0.7.75">countdown.avi</filename>
|
17
|
+
<size toolname="MediaInfo" toolversion="0.7.75">723678</size>
|
18
|
+
<md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">d43ffafa098925dae10feeca46dc9a87</md5checksum>
|
19
|
+
<fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1522855873000</fslastmodified>
|
20
|
+
</fileinfo>
|
21
|
+
<filestatus />
|
22
|
+
<metadata>
|
23
|
+
<video>
|
24
|
+
<location toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">/Users/cjcolvar/Documents/Code/samvera/hydra-works/spec/fixtures/countdown.avi</location>
|
25
|
+
<mimeType toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">video/avi</mimeType>
|
26
|
+
<format toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">AVI</format>
|
27
|
+
<duration toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">14148</duration>
|
28
|
+
<bitRate toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">409204</bitRate>
|
29
|
+
<dateModified toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">UTC 2018-04-04 15:31:13</dateModified>
|
30
|
+
<track type="video" id="0" toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">
|
31
|
+
<videoDataEncoding>CRAM</videoDataEncoding>
|
32
|
+
<codecId>CRAM</codecId>
|
33
|
+
<codecCC>CRAM</codecCC>
|
34
|
+
<codecName>CRAM</codecName>
|
35
|
+
<codecInfo>Microsoft Video 1</codecInfo>
|
36
|
+
<compression>Unknown</compression>
|
37
|
+
<byteOrder>Unknown</byteOrder>
|
38
|
+
<bitDepth>8 bits</bitDepth>
|
39
|
+
<bitRate>313826</bitRate>
|
40
|
+
<duration>14100</duration>
|
41
|
+
<delay>0</delay>
|
42
|
+
<trackSize>553118</trackSize>
|
43
|
+
<width>356 pixels</width>
|
44
|
+
<height>264 pixels</height>
|
45
|
+
<frameRate>10.000</frameRate>
|
46
|
+
<frameCount>141</frameCount>
|
47
|
+
<aspectRatio>4:3</aspectRatio>
|
48
|
+
</track>
|
49
|
+
<track type="audio" id="1" toolname="MediaInfo" toolversion="0.7.75" status="SINGLE_RESULT">
|
50
|
+
<audioDataEncoding>PCM</audioDataEncoding>
|
51
|
+
<codecId>1</codecId>
|
52
|
+
<codecFamily>PCM</codecFamily>
|
53
|
+
<compression>none</compression>
|
54
|
+
<bitRate>88200</bitRate>
|
55
|
+
<bitRateMode>Constant</bitRateMode>
|
56
|
+
<bitDepth>8 bits</bitDepth>
|
57
|
+
<duration>14148</duration>
|
58
|
+
<delay>0</delay>
|
59
|
+
<trackSize>155980</trackSize>
|
60
|
+
<samplingRate>11025</samplingRate>
|
61
|
+
<numSamples>155982</numSamples>
|
62
|
+
<channels>1</channels>
|
63
|
+
<byteOrder>Little</byteOrder>
|
64
|
+
</track>
|
65
|
+
</video>
|
66
|
+
</metadata>
|
67
|
+
<statistics fitsExecutionTime="692">
|
68
|
+
<tool toolname="MediaInfo" toolversion="0.7.75" executionTime="662" />
|
69
|
+
<tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
|
70
|
+
<tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
|
71
|
+
<tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
|
72
|
+
<tool toolname="Droid" toolversion="6.3" executionTime="273" />
|
73
|
+
<tool toolname="Jhove" toolversion="1.16" status="did not run" />
|
74
|
+
<tool toolname="file utility" toolversion="5.31" executionTime="644" />
|
75
|
+
<tool toolname="Exiftool" toolversion="10.00" status="did not run" />
|
76
|
+
<tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="did not run" />
|
77
|
+
<tool toolname="OIS File Information" toolversion="0.2" executionTime="80" />
|
78
|
+
<tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
|
79
|
+
<tool toolname="ffident" toolversion="0.2" executionTime="555" />
|
80
|
+
<tool toolname="Tika" toolversion="1.10" status="did not run" />
|
81
|
+
</statistics>
|
82
|
+
</fits>
|
83
|
+
|