diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ead8c8e..2f66bcb 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -18,11 +18,13 @@ jobs: run: | sudo apt update -y sudo apt install bundler -y + sudo apt install imagemagick # baixar imagemagick - run: cd ${{ gitea.workspace }} - #- run: ./script/script.sh + - name: Video script + run: ./script/script.sh - name: Setup bundle deps run: bundle install diff --git a/_config.yml b/_config.yml index 8f474fb..e72f951 100755 --- a/_config.yml +++ b/_config.yml @@ -29,6 +29,9 @@ theme: minima plugins: - jekyll-feed + +collections_dir: collections + # collections collections: aulas: diff --git a/_layouts/aulas.html b/_layouts/aulas.html index 024a18e..358c725 100755 --- a/_layouts/aulas.html +++ b/_layouts/aulas.html @@ -47,7 +47,7 @@ {% assign aula_slug = page.name | replace: '.md', '' %} {% assign video_aula = '' | append: aula_slug | append: '.mp4' %} diff --git a/thumbs/Introdução ao LMMS.jpg b/assets/thumbs/Introdução ao LMMS.jpg similarity index 100% rename from thumbs/Introdução ao LMMS.jpg rename to assets/thumbs/Introdução ao LMMS.jpg diff --git a/thumbs/Introdução ao Mixxx.jpg b/assets/thumbs/Introdução ao Mixxx.jpg similarity index 100% rename from thumbs/Introdução ao Mixxx.jpg rename to assets/thumbs/Introdução ao Mixxx.jpg diff --git a/aulas.md b/aulas.md index 9deb4c0..c16d2df 100755 --- a/aulas.md +++ b/aulas.md @@ -18,7 +18,7 @@ lang: pt
- +
diff --git a/_aulas/Introdução ao LMMS.md b/collections/_aulas/Introdução ao LMMS.md similarity index 100% rename from _aulas/Introdução ao LMMS.md rename to collections/_aulas/Introdução ao LMMS.md diff --git a/_aulas/Introdução ao Mixxx.md b/collections/_aulas/Introdução ao Mixxx.md similarity index 100% rename from _aulas/Introdução ao Mixxx.md rename to collections/_aulas/Introdução ao Mixxx.md diff --git a/_autores/Carlos Eduardo Oliveira de Souza.jpg b/collections/_autores/Carlos Eduardo Oliveira de Souza.jpg similarity index 100% rename from _autores/Carlos Eduardo Oliveira de Souza.jpg rename to collections/_autores/Carlos Eduardo Oliveira de Souza.jpg diff --git a/_autores/Carlos Eduardo Oliveira de Souza.md b/collections/_autores/Carlos Eduardo Oliveira de Souza.md similarity index 100% rename from _autores/Carlos Eduardo Oliveira de Souza.md rename to collections/_autores/Carlos Eduardo Oliveira de Souza.md diff --git a/_autores/Emanuel Silva Sousa.jpg b/collections/_autores/Emanuel Silva Sousa.jpg similarity index 100% rename from _autores/Emanuel Silva Sousa.jpg rename to collections/_autores/Emanuel Silva Sousa.jpg diff --git a/_autores/Emanuel Silva Sousa.md b/collections/_autores/Emanuel Silva Sousa.md similarity index 100% rename from _autores/Emanuel Silva Sousa.md rename to collections/_autores/Emanuel Silva Sousa.md diff --git a/_autores/Emerson Junio Silva Costa.jpg b/collections/_autores/Emerson Junio Silva Costa.jpg similarity index 100% rename from _autores/Emerson Junio Silva Costa.jpg rename to collections/_autores/Emerson Junio Silva Costa.jpg diff --git a/_autores/Emerson Junio Silva Costa.md b/collections/_autores/Emerson Junio Silva Costa.md similarity index 100% rename from _autores/Emerson Junio Silva Costa.md rename to collections/_autores/Emerson Junio Silva Costa.md diff --git a/_autores/Flávio Luiz Schiavoni.jpg b/collections/_autores/Flávio Luiz Schiavoni.jpg similarity index 100% rename from _autores/Flávio Luiz Schiavoni.jpg rename to collections/_autores/Flávio Luiz Schiavoni.jpg diff --git a/_autores/Flávio Luiz Schiavoni.md b/collections/_autores/Flávio Luiz Schiavoni.md similarity index 100% rename from _autores/Flávio Luiz Schiavoni.md rename to collections/_autores/Flávio Luiz Schiavoni.md diff --git a/_autores/Gabriel Lopes Rocha.jpg b/collections/_autores/Gabriel Lopes Rocha.jpg similarity index 100% rename from _autores/Gabriel Lopes Rocha.jpg rename to collections/_autores/Gabriel Lopes Rocha.jpg diff --git a/_autores/Gabriel Lopes Rocha.md b/collections/_autores/Gabriel Lopes Rocha.md similarity index 100% rename from _autores/Gabriel Lopes Rocha.md rename to collections/_autores/Gabriel Lopes Rocha.md diff --git a/_autores/Gabriel Rodrigues Chaves Carneiro.jpg b/collections/_autores/Gabriel Rodrigues Chaves Carneiro.jpg similarity index 100% rename from _autores/Gabriel Rodrigues Chaves Carneiro.jpg rename to collections/_autores/Gabriel Rodrigues Chaves Carneiro.jpg diff --git a/_autores/Gabriel Rodrigues Chaves Carneiro.md b/collections/_autores/Gabriel Rodrigues Chaves Carneiro.md similarity index 100% rename from _autores/Gabriel Rodrigues Chaves Carneiro.md rename to collections/_autores/Gabriel Rodrigues Chaves Carneiro.md diff --git a/_autores/Josiane de Fátima Ribeiro.jpg b/collections/_autores/Josiane de Fátima Ribeiro.jpg similarity index 100% rename from _autores/Josiane de Fátima Ribeiro.jpg rename to collections/_autores/Josiane de Fátima Ribeiro.jpg diff --git a/_autores/Josiane de Fátima Ribeiro.md b/collections/_autores/Josiane de Fátima Ribeiro.md similarity index 100% rename from _autores/Josiane de Fátima Ribeiro.md rename to collections/_autores/Josiane de Fátima Ribeiro.md diff --git a/_autores/Júlio César de Sousa.jpg b/collections/_autores/Júlio César de Sousa.jpg similarity index 100% rename from _autores/Júlio César de Sousa.jpg rename to collections/_autores/Júlio César de Sousa.jpg diff --git a/_autores/Júlio César de Sousa.md b/collections/_autores/Júlio César de Sousa.md similarity index 100% rename from _autores/Júlio César de Sousa.md rename to collections/_autores/Júlio César de Sousa.md diff --git a/_autores/Matheus De Bomfim Rodrigues Jordão.jpg b/collections/_autores/Matheus De Bomfim Rodrigues Jordão.jpg similarity index 100% rename from _autores/Matheus De Bomfim Rodrigues Jordão.jpg rename to collections/_autores/Matheus De Bomfim Rodrigues Jordão.jpg diff --git a/_autores/Matheus De Bomfim Rodrigues Jordão.md b/collections/_autores/Matheus De Bomfim Rodrigues Jordão.md similarity index 100% rename from _autores/Matheus De Bomfim Rodrigues Jordão.md rename to collections/_autores/Matheus De Bomfim Rodrigues Jordão.md diff --git a/_cursos/LMMS.md b/collections/_cursos/LMMS.md similarity index 100% rename from _cursos/LMMS.md rename to collections/_cursos/LMMS.md diff --git a/_software/Hydrogen.md b/collections/_software/Hydrogen.md similarity index 100% rename from _software/Hydrogen.md rename to collections/_software/Hydrogen.md diff --git a/_software/LMMS.md b/collections/_software/LMMS.md similarity index 100% rename from _software/LMMS.md rename to collections/_software/LMMS.md diff --git a/_software/Pure Data.md b/collections/_software/Pure Data.md similarity index 100% rename from _software/Pure Data.md rename to collections/_software/Pure Data.md diff --git a/_software/Sooper Looper.md b/collections/_software/Sooper Looper.md similarity index 100% rename from _software/Sooper Looper.md rename to collections/_software/Sooper Looper.md diff --git a/_software/Zynaddsub.md b/collections/_software/Zynaddsub.md similarity index 100% rename from _software/Zynaddsub.md rename to collections/_software/Zynaddsub.md diff --git a/script/script.sh b/script/script.sh index a518106..14e6cdb 100755 --- a/script/script.sh +++ b/script/script.sh @@ -1,5 +1,5 @@ #!/bin/sh -SRC=_aulas +SRC=collections/_aulas SCRIPT=script/ TMP=tmp/ PARAM="scale=1920:1080: force_original_aspect_ratio=decrease: eval=frame,pad=1920:1080: -1:-1:color=black" @@ -17,8 +17,8 @@ fi # #################################### # Creating dest dir # #################################### -mkdir -p ./thumbs -mkdir -p ./videos +mkdir -p ./assets/thumbs +mkdir -p ./assets/videos for aula in ./${SRC}/*.md; do # #################################### @@ -40,14 +40,14 @@ for aula in ./${SRC}/*.md; do # #################################### # Creating the thumbnail if does not exist # #################################### - if test ! -f "./thumbs/${NAME}.jpg" ; then - ffmpeg -y -i "${INPUT}" -vframes 1 -an -s 400x222 -ss 30 "./thumbs/${NAME}.jpg" + if test ! -f "./assets/thumbs/${NAME}.jpg" ; then + ffmpeg -y -i "${INPUT}" -vframes 1 -an -s 400x222 -ss 30 "./assets/thumbs/${NAME}.jpg" fi # #################################### # if output exist, continue # #################################### - if test -f "./videos/${NAME}.mp4" ; then + if test -f "./assets/videos/${NAME}.mp4" ; then continue fi @@ -90,7 +90,7 @@ for aula in ./${SRC}/*.md; do -vcodec libx264 \ -pix_fmt yuv420p \ -vsync 2 \ - "./videos/${NAME}.mp4" + "./assets/videos/${NAME}.mp4" done rm -f ${tmp} diff --git a/tmp/tmp-intro.mkv b/tmp/tmp-intro.mkv new file mode 100644 index 0000000..6041c00 Binary files /dev/null and b/tmp/tmp-intro.mkv differ diff --git a/tmp/tmp-intro.svg b/tmp/tmp-intro.svg new file mode 100644 index 0000000..074a3db --- /dev/null +++ b/tmp/tmp-intro.svg @@ -0,0 +1,959 @@ + + + +ALICEApresenta:*