update various parameters and commands, use GPU

diff --git a/src/home/telecaster/bin/py/transcode.py b/src/home/telecaster/bin/py/transcode.py
index c326a835792d1c344d2c029a4253ad050516b132..336802e1eda30ba4646edfc8731d31d9fdfdfc33 100644 (file)
--- a/src/home/telecaster/bin/py/transcode.py
+++ b/src/home/telecaster/bin/py/transcode.py
@@ -27,7 +27,7 @@ class TelemetaTranscode(object):
                    'png' : '-ss 0:5:0',
                   }
 
-    date_limit = datetime.datetime(year=2021, month=6, day=24)
+    date_limit = datetime.datetime(year=2023, month=10, day=21)
 
     def __init__(self, args):
         self.args = args

diff --git a/src/home/telecaster/bin/py/transcode_nv-pro.py b/src/home/telecaster/bin/py/transcode_nv-pro.py
index 1c0161f0309aa7d63cad9e5d3c6be81f984a0d7c..32c16eb9aa6231fe25b608ddae70201ce31da80e 100644 (file)
--- a/src/home/telecaster/bin/py/transcode_nv-pro.py
+++ b/src/home/telecaster/bin/py/transcode_nv-pro.py
@@ -20,10 +20,9 @@ class Logger:
 class TelemetaTranscode(object):
     """docstring for TelemetaTranscode"""
 
-    source_formats = ['webm',]
+    source_formats = ['mp4',]
     dest_formats = {
                    'mp3' : '-vn -acodec libmp3lame -aq 6',
-                   'mp4' : '-c:v h264_nvenc -maxrate 1100k -c:a aac -b:a 128k',
                    'png' : '-ss 0:0:10',
                   }
 

diff --git a/src/home/telecaster/bin/py/transcode_nv.py b/src/home/telecaster/bin/py/transcode_nv.py
index eebf26a09b9b49c8a1542f044511f899cf717336..e55fe29355efb681ef6d95f4f2bb12cf7818f049 100644 (file)
--- a/src/home/telecaster/bin/py/transcode_nv.py
+++ b/src/home/telecaster/bin/py/transcode_nv.py
@@ -24,10 +24,10 @@ class TelemetaTranscode(object):
     dest_formats = {
                    'mp3' : '-vn -acodec libmp3lame -aq 6',
                    'mp4' : '-c:v h264_nvenc -maxrate 1100k -c:a aac -b:a 128k',
-                   'png' : '-ss 0:5:0',
+                   'png' : '-ss 0:0:10',
                   }
 
-    date_limit = datetime.datetime(year=2021, month=6, day=24)
+    date_limit = datetime.datetime(year=2023, month=10, day=24)
 
     def __init__(self, args):
         self.args = args

diff --git a/src/home/telecaster/bin/telecaster_master-ae.sh b/src/home/telecaster/bin/telecaster_master-ae.sh
index 2d6948bd456069dc506589c8943b090b7b84ddf7..3ccf8bce9e300e215e28841e6e687e70929ccf53 100755 (executable)
--- a/src/home/telecaster/bin/telecaster_master-ae.sh
+++ b/src/home/telecaster/bin/telecaster_master-ae.sh
@@ -1,27 +1,34 @@
 #!/bin/bash
 
-media_dir=/home/telecaster/archives/Pre-Barreau/AE/
-tmp_log=/tmp/telecaster-remux-ae.log
-log=/home/telecaster/log/remux-ae.log
-tmp_dir=/home/telecaster/tmp/
-app_server=angus.parisson.com
-media_server=angus.parisson.com
-emails="webmaster@parisson.com,jeannot@parisson.com"
-subject="TeleCaster remux (AE)"
+organization=Pre-Barreau
+department=AE
 year=`date '+%Y'`
-#year=2020
 year2=$((year-1))
-#echo $year2
+media_dir=/home/telecaster/archives/$organization/$department/$year/
+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
+import_log=/var/log/app/import_media.log
+tmp_dir=/home/telecaster/tmp/
+app_server=malcom.parisson.com
+app_path=/srv/ae-docker
+media_server=malcom.parisson.com
+emails="webmaster@parisson.com,jeannot@parisson.com"
+subject="TeleCaster remux ($departement)"
+bwlimit=20000
+
 
-python ~/apps/Telemeta/scripts/transcode/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
+python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
 
-#cat $tmp_log >> $log
+cat $tmp_log >> $remux_log
 
-echo "$media_server:$media_dir"
+python ~/bin/py/transcode_nv.py $media_dir $transcode_log
 
-rsync -avuLKPr --delete --bwlimit=15000 --include="*/" --include="$year/**" --include="$year2/**" --exclude="*" $media_dir $media_server:$media_dir
+rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**"  --include="$year2/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$server_media_dir
 
-ssh $app_server "~/bin/teleforma_import.sh"
+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"
 
 python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails
 

diff --git a/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh b/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh
index d20fae9c4b0ca08cdb61880b00ae837b4088a08f..1668e9cddf86e9804bd0d709b4d1dea799e1d2a4 100755 (executable)
--- a/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh
+++ b/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh
@@ -13,16 +13,18 @@ emails="webmaster@parisson.com,jeannot@parisson.com"
 subject="TeleCaster remux (CRFPA)"
 bwlimit=20000
 
-python ~/apps/Telemeta/scripts/transcode/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
+python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
 
-cat $tmp_log >> $log
+cat $tmp_log >> $remux_log
 
-rsync -uLKPr $media_dir $backup_dir
+#rsync -uLKPr $media_dir $backup_dir
 
-python ~/apps/Telemeta/scripts/transcode/transcode_nv.py $backup_dir ~/log/transcode-crfpa.log
+#echo `date` >> ~/log/transcode-crfpa.log
 
-find $backup_dir -type d -exec chmod 755 {} \;
-find $backup_dir -type f -exec chmod 644 {} \;
+python ~/bin/py/transcode_nv.py $media_dir $transcode_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

diff --git a/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh b/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh
index f24e267b1d790412ea829c84c5c482d910f301fe..413ffc4a6f64a3f14a3974ef5ba59e4697e776ba 100755 (executable)
--- a/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh
+++ b/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh
@@ -4,6 +4,7 @@ organization=Pre-Barreau
 department=CRFPA
 year=`date '+%Y'`
 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
@@ -21,22 +22,15 @@ python ~/bin/py/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 ~/bin/py/transcode.py $media_dir $transcode_log
+python ~/bin/py/transcode_nv.py $media_dir $transcode_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 -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$media_dir
+rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $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 $import_log"
 
-#python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails
+python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails
 
 

diff --git a/src/home/telecaster/bin/telecaster_master-pro.sh b/src/home/telecaster/bin/telecaster_master-pro.sh
index a872eb26b64c70eee808046f1dfc855cd126c046..8f3b26df9062f94f7110c1f59c4c1e5b09692707 100755 (executable)
--- a/src/home/telecaster/bin/telecaster_master-pro.sh
+++ b/src/home/telecaster/bin/telecaster_master-pro.sh
@@ -22,7 +22,7 @@ for y in `seq $(($year)) $(($year+1))`; do
  #python ~/apps/Telemeta/scripts/transcode/transcode.py $media_dir $log_dir/transcode-pro.log
 
  python ~/bin/py/remux_fix_media.py $archives_dir $tmp_dir >> $log_dir/remux-pro.log
- python ~/bin/py/transcode-pro.py $media_dir $log_dir/transcode-pro.log
+ python ~/bin/py/transcode_nv-pro.py $media_dir $log_dir/transcode-pro.log
 
  chmod -fR 664 $media_dir; chmod -fR +rX $media_dir
  rsync -aquLKP --bwlimit=15000 --delete --exclude="@eaDir" $media_dir $server:$server_media_dir