update publishing scripts

diff --git a/bin/publishing/telecaster_master-ae.sh b/bin/publishing/telecaster_master-ae.sh
index 21ea65e8b026a531cf5e7b28f96754a5a1838381..10287bd93d255ad7acf2a1547156d5ebe3400d74 100755 (executable)
--- a/bin/publishing/telecaster_master-ae.sh
+++ b/bin/publishing/telecaster_master-ae.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-telecaster_server=/srv/telecaster-server
+telecaster_server=/srv/telecaster/telecaster-server
 organization=Pre-Barreau
 department=AE
 year=`date '+%Y'`
@@ -10,7 +10,7 @@ server_media_dir=/mnt/ae-videos/$organization/$department/$year/
 backup_dir=/mnt/nile/$organization/$department/$year/
 tmp_log=/tmp/telecaster-$department.log
 remux_log=/home/telecaster/log/remux-$department.log
-transcode_log=/home/telecaster/log/transcode-$department.log
+mastering_log=/home/telecaster/log/mastering-$department.log
 import_log=/var/log/app/import_media.log
 tmp_dir=/home/telecaster/tmp/
 app_server=malcom.parisson.com
@@ -20,12 +20,7 @@ emails="webmaster@parisson.com,jeannot@parisson.com"
 subject="TeleCaster remux ($departement)"
 bwlimit=20000
 
-
-python $telecaster_server/bin/mastering/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
-
-cat $tmp_log >> $remux_log
-
-python $telecaster_server/bin/mastering/transcode_nv.py $media_dir $transcode_log
+python $telecaster_server/bin/mastering/mastering.py --nvidia --dir $media_dir --log $mastering_log
 
 rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**"  --include="$year2/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$server_media_dir
 

diff --git a/bin/publishing/telecaster_master-crfpa-mp4-staging.sh b/bin/publishing/telecaster_master-crfpa-mp4-staging.sh
index 540d38c751547563a03b1d0a3e53c017c080fd68..58ec0438143f0a8b4dc88a8fe1ee45f12eaa96a5 100755 (executable)
--- a/bin/publishing/telecaster_master-crfpa-mp4-staging.sh
+++ b/bin/publishing/telecaster_master-crfpa-mp4-staging.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 
-telecaster_server=/srv/telecaster-server
+telecaster_server=/srv/telecaster/telecaster-server
+organization=Pre-Barreau
+department=CRFPA
 year=`date '+%Y'`
-media_dir=/home/telecaster/archives/Pre-Barreau/CRFPA/$year/
-backup_dir=/mnt/nile/Pre-Barreau/CRFPA/$year/
-tmp_log=/tmp/telecaster-remux-crfpa.log
-log=/home/telecaster/log/remux-crfpa.log
-tmp_dir=/home/telecaster/tmp/
+local_media_dir=/home/telecaster/archives/$organization/$department/$year/
+server_media_dir=/mnt/crfpa-videos/$organization/$department/$year/
+tmp_log=/tmp/telecaster-mastering-$department.log
+mastering_log=/home/telecaster/log/mastering-$department.log
+server_import_log=/var/log/app/import_media.log
 app_server=malcom.parisson.com
 app_path=/srv/crfpa-docker-staging
 media_server=malcom.parisson.com
@@ -14,25 +16,15 @@ emails="webmaster@parisson.com,jeannot@parisson.com"
 subject="TeleCaster remux (CRFPA)"
 bwlimit=20000
 
-python $telecaster_server/bin/mastering/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
-
-cat $tmp_log >> $remux_log
-
-#rsync -uLKPr $media_dir $backup_dir
-
-#echo `date` >> ~/log/transcode-crfpa.log
-
-python $telecaster_server/bin/mastering/transcode_nv.py $media_dir $transcode_log
+python $telecaster_server/bin/mastering/mastering.py --nvidia --dir $media_dir --log $mastering_log
 
 #find $backup_dir -type d -exec chmod 755 {} \;
 #find $backup_dir -type f -exec chmod 644 {} \;
 
-#rsync -auLKPr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*" $backup_dir $media_server:$media_dir
-#rsync -uLKPr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude=".webm" --exclude=".ogg" --exclude="*" $backup_dir $media_server:$media_dir
-rsync -auLKPr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $backup_dir $media_server:$media_dir
+rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $local_media_dir $media_server:$server_media_dir
 
-ssh $app_server "docker-compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec app /srv/app/manage.py teleforma-import-conferences-2 Pre-Barreau CRFPA /var/log/app/import_media.log"
+ssh $app_server "docker compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $server_import_log"
 
-#python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails
+python $telecaster_server/bin/messaging/mail_msg.py $subject $tmp_log $emails
 
 

diff --git a/bin/publishing/telecaster_master-crfpa-mp4.sh b/bin/publishing/telecaster_master-crfpa-mp4.sh
index 91f01440282d660dcd2e0aca52a5ac6ca848ffa5..84d2f53ba1fdaeae51968b5126485462e4d7b255 100755 (executable)
--- a/bin/publishing/telecaster_master-crfpa-mp4.sh
+++ b/bin/publishing/telecaster_master-crfpa-mp4.sh
@@ -1,17 +1,14 @@
 #!/bin/bash
 
-telecaster_server=/srv/telecaster-server
+telecaster_server=/srv/telecaster/telecaster-server
 organization=Pre-Barreau
 department=CRFPA
 year=`date '+%Y'`
-media_dir=/home/telecaster/archives/$organization/$department/$year/
+local_media_dir=/home/telecaster/archives/$organization/$department/$year/
 server_media_dir=/mnt/crfpa-videos/$organization/$department/$year/
-backup_dir=/mnt/nile/$organization/$department/$year/
-tmp_log=/tmp/telecaster-$department.log
-remux_log=/home/telecaster/log/remux-$department.log
-transcode_log=/home/telecaster/log/transcode-$department.log
-import_log=/var/log/app/import_media.log
-tmp_dir=/home/telecaster/tmp/
+tmp_log=/tmp/telecaster-mastering-$department.log
+mastering_log=/home/telecaster/log/mastering-$department.log
+server_import_log=/var/log/app/import_media.log
 app_server=malcom.parisson.com
 app_path=/srv/crfpa-docker
 media_server=malcom.parisson.com
@@ -19,18 +16,14 @@ emails="webmaster@parisson.com,jeannot@parisson.com"
 subject="TeleCaster remux (CRFPA)"
 bwlimit=20000
 
-python $telecaster_server/bin/mastering/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
-
-cat $tmp_log >> $remux_log
-
-python $telecaster_server/bin/mastering/transcode_nv.py $media_dir $transcode_log
+python $telecaster_server/bin/mastering/mastering.py --nvidia --dir $media_dir --log $mastering_log
 
 #find $backup_dir -type d -exec chmod 755 {} \;
 #find $backup_dir -type f -exec chmod 644 {} \;
 
-rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$server_media_dir
+rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $local_media_dir $media_server:$server_media_dir
 
-ssh $app_server "docker compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $import_log"
+ssh $app_server "docker compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $server_import_log"
 
 python $telecaster_server/bin/messaging/mail_msg.py $subject $tmp_log $emails
 

diff --git a/bin/publishing/telecaster_master-pro.sh b/bin/publishing/telecaster_master-pro.sh
index 99673cee5542b4d0dae8007a603d8c57cec572ef..9ae94f9844fb75d2f393038ac801facb030ced15 100755 (executable)
--- a/bin/publishing/telecaster_master-pro.sh
+++ b/bin/publishing/telecaster_master-pro.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-telecaster_server=/srv/telecaster-server
+telecaster_server=/srv/telecaster/telecaster-server
 
 day=`date '+%Y-%m-%d_%H-%M-%S'`
 year=`date '+%Y'`