Skip to content

Commit c4a3fad

Browse files
author
anisa-hawes
committed
Merge branch 'gh-pages' into q2-bulletin
2 parents a964913 + 9b033e1 commit c4a3fad

18 files changed

Lines changed: 369 additions & 5 deletions

_build/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Build site, and then run htmlproofer to check for broken internal and external links
44

5-
bundle exec jekyll build && htmlproofer _site --assume-extension --empty-alt-ignore --alt-ignore '/.*/' --file-ignore "/assets/,/retired/,/retirada/,/retrait/,/posts/" --timeframe '30d' --only-4xx --http-status-ignore 429,403,400 --url-ignore "/http://www.gutenberg.org/*/,/https://github.com/programminghistorian/jekyll/(commits|blob)/*/,/\#/,/espanol/,/deprecated/,/collection.britishmuseum.org/,/analytics.hathitrust.org/,/fr.wikipedia.org/wiki/,https://web.archive.org/web/20180831094856/http://www.dlsi.ua.es/~borja/riilua/6.TopicModeling_v02.pdf" --allow-hash-href
5+
bundle exec jekyll build && htmlproofer _site --assume-extension --empty-alt-ignore --alt-ignore '/.*/' --file-ignore "/assets/,/retired/,/retirada/,/retrait/,/posts/" --timeframe '30d' --only-4xx --http-status-ignore 429,403,400 --url-ignore "/http://www.gutenberg.org/*/,/https://github.com/programminghistorian/jekyll/(commits|blob)/*/,/\#/,/espanol/,/deprecated/,/collection.britishmuseum.org/,/analytics.hathitrust.org/,/fr.wikipedia.org/wiki/,/doi.org/,https://web.archive.org/web/20180831094856/http://www.dlsi.ua.es/~borja/riilua/6.TopicModeling_v02.pdf" --allow-hash-href
66

77
## Updated version of htmlproofer commands (internal linking still doesn't work for some reason).
88
# htmlproofer ./_site \
@@ -12,8 +12,7 @@ bundle exec jekyll build && htmlproofer _site --assume-extension --empty-alt-ign
1212
# --cache "{ \"timeframe\": { \"external\": \"30d\" } }" \
1313
# --only-4xx \
1414
# --ignore-status-codes 429,403,400 \
15-
# --ignore-urls "/http://www.gutenberg.org/*/,/https://github.com/programminghistorian/jekyll/(commits|blob)/*/,/\#/,/espanol/,/deprecated/,/collection.britishmuseum.org/,/analytics.hathitrust.org/,/fr.wikipedia.org/wiki/,https://web.archive.org/web/20180831094856/http://www.dlsi.ua.es/~borja/riilua/6.TopicModeling_v02.pdf" \
16-
15+
# --ignore-urls "/http://www.gutenberg.org/*/,/https://github.com/programminghistorian/jekyll/(commits|blob)/*/,/\#/,/espanol/,/deprecated/,/collection.britishmuseum.org/,/analytics.hathitrust.org/,/fr.wikipedia.org/wiki/,/doi.org/,https://web.archive.org/web/20180831094856/http://www.dlsi.ua.es/~borja/riilua/6.TopicModeling_v02.pdf" \
1716

1817
# The folllowing comments docuemnt what each line of that build script does.
1918

en/lessons/digital-exhibition-collectionbuilder.md

Lines changed: 365 additions & 0 deletions
Large diffs are not rendered by default.

en/lessons/introduction-to-ffmpeg.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ Contrasting the limited use of color in our Mars excerpt, the Earth trace covers
370370
{% include figure.html filename="lovely_oil.png" caption="Oil and American ideals of wealth and prosperity rendered in colorful splendor" %}
371371

372372
### Scaling Color Analysis with FFprobe
373-
One of the limits of this methodology is that we are manually generating color reports on only one file at a time. If we wanted to take a [distant viewing](https://distantviewing.org/) approach more in-line with traditional DH methodologies, we could employ a Bash script to run our `ffprobe` command on all files in a given directory. This is useful if, for example, a researcher was interested in conducting similar analysis on [all the John Sutherland animated films found in the Prelinger Archives collection](https://archive.org/details/prelinger&tab=collection?and%5B%5D=john+sutherland&sin=) or another set of archival video material.
373+
One of the limits of this methodology is that we are manually generating color reports on only one file at a time. If we wanted to take a [distant viewing](https://distantviewing.org/) approach more in-line with traditional DH methodologies, we could employ a Bash script to run our `ffprobe` command on all files in a given directory. This is useful if, for example, a researcher was interested in conducting similar analysis on [all the John Sutherland animated films found in the Prelinger Archives collection](https://archive.org/details/prelinger?tab=collection&query=sutherland) or another set of archival video material.
374374

375375
Once you have a set of material to work with saved in one place, you can save the following [Bash for loop](https://www.shellscript.sh/loops.html) within the directory and execute it to generate `.csv` files containing the same frame-level median hue data we extracted from our excerpts of *Destination Earth*.
376376

es/lecciones/introduccion-a-ffmpeg.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ Como una pieza de propaganda, *Destination Earth* se basa en estas distinciones
382382
{% include figure.html filename="lovely_oil.png" caption="El petróleo y los ideales estadounidenses de riqueza y prosperidad se expresan en esplendor colorido" %}
383383

384384
### Escalando el análisis de color con FFprobe
385-
Uno de los límites de esta metodología es que estamos generando manualmente informes de color en un solo archivo a la vez. Si quisiéramos adoptar un enfoque de [visión distante](https://distantviewing.org/) más en línea con las metodologías tradicionales de Humanidades Digitales, podríamos emplear un script de Bash para ejecutar nuestro comando `ffprobe` en todos los archivos en un determinado directorio. Esto es útil si, por ejemplo, un(a) investigador(a) esta interesado en realizar un análisis similar en [todas las películas animadas de John Sutherland encontradas en la colección de Archivos Prelinger](https://archive.org/details/prelinger&tab=collection?and%5B%5D=john+sutherland&sin=) u otro conjunto de material de vídeo de archivo.
385+
Uno de los límites de esta metodología es que estamos generando manualmente informes de color en un solo archivo a la vez. Si quisiéramos adoptar un enfoque de [visión distante](https://distantviewing.org/) más en línea con las metodologías tradicionales de Humanidades Digitales, podríamos emplear un script de Bash para ejecutar nuestro comando `ffprobe` en todos los archivos en un determinado directorio. Esto es útil si, por ejemplo, un(a) investigador(a) esta interesado en realizar un análisis similar en [todas las películas animadas de John Sutherland encontradas en la colección de Archivos Prelinger](https://archive.org/details/prelinger?tab=collection&query=sutherland) u otro conjunto de material de vídeo de archivo.
386386

387387
Una vez que tengas un conjunto de material para trabajar guardado en un solo lugar, puedes guardar el siguiente [bucle _for_ de Bash o "for loop"](https://www.shellscript.sh/loops.html) dentro del directorio y ejecutarlo para generar archivos `.csv` que contengan los mismos datos de tono medio a nivel de fotograma que extrajimos de nuestros extractos de *Destination Earth*.
388388

163 KB
Loading
78.6 KB
Loading
77 KB
Loading
22.9 KB
Loading
42.6 KB
Loading
15.9 KB
Loading

0 commit comments

Comments
 (0)