From 05d16367f02a10407c4087c226dbe47dc4d52252 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 06:58:14 +0200 Subject: [PATCH 01/11] script folder --- check_audio_framemd5.sh => script/check_audio_framemd5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename check_audio_framemd5.sh => script/check_audio_framemd5.sh (95%) diff --git a/check_audio_framemd5.sh b/script/check_audio_framemd5.sh similarity index 95% rename from check_audio_framemd5.sh rename to script/check_audio_framemd5.sh index e49d3b1..01dd2e3 100755 --- a/check_audio_framemd5.sh +++ b/script/check_audio_framemd5.sh @@ -32,7 +32,7 @@ Dependency: ffmpeg About: Version: ${VERSION} - Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/check_audio_framemd5.sh + Website: https://github.com/amiaopensource/script/ffmprovisr/blob/gh-pages/check_audio_framemd5.sh EOF exit 0 } From 58663a869fb9afa9680764dabbe00a3c26478cbf Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:00:15 +0200 Subject: [PATCH 02/11] script folder --- check_video_framemd5.sh => script/check_video_framemd5.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename check_video_framemd5.sh => script/check_video_framemd5.sh (97%) diff --git a/check_video_framemd5.sh b/script/check_video_framemd5.sh similarity index 97% rename from check_video_framemd5.sh rename to script/check_video_framemd5.sh index 3dc8b10..05726f0 100644 --- a/check_video_framemd5.sh +++ b/script/check_video_framemd5.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash SCRIPT=$(basename "${0}") - VERSION='2017-04-16' + VERSION='2017-04-17' AUTHOR='ffmprovisr' RED='\033[1;31m' BLUE='\033[1;34m' @@ -32,7 +32,7 @@ Dependency: ffmpeg About: Version: ${VERSION} - Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/check_video_framemd5.sh + Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/script/check_video_framemd5.sh EOF exit 0 } From a1cc5a442801092c88a561d2c087fda12ad2b66e Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:00:48 +0200 Subject: [PATCH 03/11] update date --- script/check_audio_framemd5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/check_audio_framemd5.sh b/script/check_audio_framemd5.sh index 01dd2e3..25115e5 100755 --- a/script/check_audio_framemd5.sh +++ b/script/check_audio_framemd5.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash SCRIPT=$(basename "${0}") - VERSION='2017-04-15' + VERSION='2017-04-17' AUTHOR='ffmprovisr' RED='\033[1;31m' BLUE='\033[1;34m' From 195bc5446eba888df19c10dd5f72f6e1b5f216f0 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:04:00 +0200 Subject: [PATCH 04/11] script folder --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index e222463..42b6ee2 100644 --- a/index.html +++ b/index.html @@ -1172,7 +1172,7 @@ foreach ($file in $inputfiles) {
-an
ignores the audio stream (audio no)
output_file
path, name and extension of the output file
-

You may verify an MD5 checksum file created this way by using a Bash script.

+

You may verify an MD5 checksum file created this way by using a Bash script.

@@ -1202,7 +1202,7 @@ foreach ($file in $inputfiles) {
-vn
ignores the video stream (video no)
output_file
path, name and extension of the output file
-

You may verify an MD5 checksum file created this way by using a Bash script.

+

You may verify an MD5 checksum file created this way by using a Bash script.

From 59e6c6d87969ba41d2bdb567de57f58afc846db3 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:05:07 +0200 Subject: [PATCH 05/11] correct link --- script/check_audio_framemd5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/check_audio_framemd5.sh b/script/check_audio_framemd5.sh index 25115e5..bdf3001 100755 --- a/script/check_audio_framemd5.sh +++ b/script/check_audio_framemd5.sh @@ -32,7 +32,7 @@ Dependency: ffmpeg About: Version: ${VERSION} - Website: https://github.com/amiaopensource/script/ffmprovisr/blob/gh-pages/check_audio_framemd5.sh + Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/script/check_audio_framemd5.sh EOF exit 0 } From 89039f55b3012f75c5b908c80cd2ebdc77b2f6a6 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:52:12 +0200 Subject: [PATCH 06/11] [WIP] update readme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add maintainers - add link to PR - move licence at the end Remarks: - It needs more work by an English native. - The section `AVHack Team` could be called `History` and start with Ashley’s first release. --- readme.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/readme.md b/readme.md index e6cf4f9..f1d8bf4 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # [ffmprovisr](http://amiaopensource.github.io/ffmprovisr) -Repository of useful FFmpeg command lines for archivists! [AMIA hackday](http://wiki.curatecamp.org/index.php/Association_of_Moving_Image_Archivists_%26_Digital_Library_Federation_Hack_Day_2015) edition. +Repository of useful FFmpeg command lines for archivists! ## What is this? @@ -14,20 +14,20 @@ Code stuff in the gh-pages branch (the default primary branch). Readme is right You are welcome to edit the codebase yourself or just supply the information and ask it to be added to the site. -To contribute to this project directly (and more quickly), clone this repository and create a new branch (`git checkout -b your-branch-name`) and add or modify a new block in index.html. Then submit a pull request and someone can review and integrate your code. There is a commented-out sample available at the bottom of index.html that can be used to build your own block. +To contribute to this project directly (and more quickly), clone this repository and create a new branch (`git checkout -b your-branch-name`) and add or modify a new block in index.html. Then [submit a pull request](https://github.com/amiaopensource/ffmprovisr/pulls) and the maintainers will review and integrate your code. There is a commented-out sample available at the bottom of index.html that can be used to build your own block. If you are having trouble with the coding it yourself or with github, feel free to [submit an issue](https://github.com/amiaopensource/ffmprovisr/issues) with the kind of command you would like to see added to the site. If you want to help but don't have a new script to add, you can help us by testing out the scripts available, by refining or clarifying the documentation, or [creating an issue](https://github.com/amiaopensource/ffmprovisr/issues) for anything that sounds confusing and requires clarification. -## License - -Creative Commons License
This work by ffmprovisr is licensed under a Creative Commons Attribution 4.0 International License.
Based on a work at https://github.com/amiaopensource/ffmprovisr. - ## Code of Conduct You can read our contributor code of conduct [here](https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/code_of_conduct.md). +## Maintainers + +[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol) and [Reto Kromer](https://github.com/retokromer) + ## Contributors * Gathered using [octohatrack](https://github.com/LABHR/octohatrack) @@ -68,7 +68,9 @@ Repo: amiaopensource/ffmprovisr GitHub Contributors: 11 All Contributors: 18 -## AVHack Team: +## AVHack Team + +[Association of Moving Image Archivists & Digital Library Federation Hack Day 2015](http://wiki.curatecamp.org/index.php/Association_of_Moving_Image_Archivists_%26_Digital_Library_Federation_Hack_Day_2015) [Ashley Blewer](https://github.com/ablwr), Eddy Colloton, Rebecca Dillmeier, [Jonathan Farbowitz](https://github.com/jfarbowitz), Rebecca Fraimow, Samuel Gutterman, Kelly Haydon, [Reto Kromer](https://github.com/retokromer), Nicole Martin, [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol), Catriona Schlosser, Ben Turkus @@ -76,3 +78,7 @@ All Contributors: 18 [Script Ahoy](http://dd388.github.io/crals/): Community Resource for Archivists and Librarians Scripting [sourcecaster](https://datapraxis.github.io/sourcecaster/): helps you use the command line to work through common challenges that come up when working with digital primary sources. + +## License + +Creative Commons License
This work by ffmprovisr is licensed under a Creative Commons Attribution 4.0 International License.
Based on a work at https://github.com/amiaopensource/ffmprovisr. From cb7f0014447cb410ced4c2f2f67aaf97b36c0fa5 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:55:58 +0200 Subject: [PATCH 07/11] plural --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 42b6ee2..670319e 100644 --- a/index.html +++ b/index.html @@ -1172,7 +1172,7 @@ foreach ($file in $inputfiles) {
-an
ignores the audio stream (audio no)
output_file
path, name and extension of the output file
-

You may verify an MD5 checksum file created this way by using a Bash script.

+

You may verify an MD5 checksum file created this way by using a Bash script.

@@ -1202,7 +1202,7 @@ foreach ($file in $inputfiles) {
-vn
ignores the video stream (video no)
output_file
path, name and extension of the output file
-

You may verify an MD5 checksum file created this way by using a Bash script.

+

You may verify an MD5 checksum file created this way by using a Bash script.

From e762c7dc427e01f83f053e1cfa69da4b64477e0c Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:57:49 +0200 Subject: [PATCH 08/11] plural --- {script => scripts}/check_audio_framemd5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {script => scripts}/check_audio_framemd5.sh (98%) diff --git a/script/check_audio_framemd5.sh b/scripts/check_audio_framemd5.sh similarity index 98% rename from script/check_audio_framemd5.sh rename to scripts/check_audio_framemd5.sh index bdf3001..7ed822b 100755 --- a/script/check_audio_framemd5.sh +++ b/scripts/check_audio_framemd5.sh @@ -32,7 +32,7 @@ Dependency: ffmpeg About: Version: ${VERSION} - Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/script/check_audio_framemd5.sh + Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/scripts/check_audio_framemd5.sh EOF exit 0 } From 54a8ab605783ced4f718c284f40fa4311d94fa23 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 07:58:26 +0200 Subject: [PATCH 09/11] plural --- {script => scripts}/check_video_framemd5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {script => scripts}/check_video_framemd5.sh (98%) diff --git a/script/check_video_framemd5.sh b/scripts/check_video_framemd5.sh similarity index 98% rename from script/check_video_framemd5.sh rename to scripts/check_video_framemd5.sh index 05726f0..d966ae9 100644 --- a/script/check_video_framemd5.sh +++ b/scripts/check_video_framemd5.sh @@ -32,7 +32,7 @@ Dependency: ffmpeg About: Version: ${VERSION} - Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/script/check_video_framemd5.sh + Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/scripts/check_video_framemd5.sh EOF exit 0 } From 0a6e5a4a7adb1dac895737acdee1223f6f4f3b10 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 11:46:10 +0200 Subject: [PATCH 10/11] more coherent output prompt --- scripts/check_audio_framemd5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_audio_framemd5.sh b/scripts/check_audio_framemd5.sh index 7ed822b..27253ac 100755 --- a/scripts/check_audio_framemd5.sh +++ b/scripts/check_audio_framemd5.sh @@ -13,7 +13,7 @@ fi _output_prompt(){ cat < -m ] +Usage: ${SCRIPT} -h | -i -m EOF exit 1 } From 750a763157cf27acc5a84b5495ed045ca2d305f5 Mon Sep 17 00:00:00 2001 From: Reto Kromer Date: Mon, 17 Apr 2017 11:46:46 +0200 Subject: [PATCH 11/11] more coherent output prompt --- scripts/check_video_framemd5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_video_framemd5.sh b/scripts/check_video_framemd5.sh index d966ae9..9896ac3 100644 --- a/scripts/check_video_framemd5.sh +++ b/scripts/check_video_framemd5.sh @@ -13,7 +13,7 @@ fi _output_prompt(){ cat < -m ] +Usage: ${SCRIPT} -h | -i -m EOF exit 1 }