Attachment 11926 Details for Bug 27357 – communDefine.include

communDefine.include

communDefine.include (text/plain), 7.71 KB, created by kalagani kalagani on 2020-10-11 12:55:55 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: kalagani kalagani

Created: 2020-10-11 12:55:55 CEST

Size: 7.71 KB

patch

obsolete

># commonDefine.include
># _fichier de dÃ©finition de variables communes aux fichiers:
>#   indexPhotos.bash          
>#   comptagePhotos.bash
>#   comparePhotoBySignatureLow.bash
>#   comparePhotoBySignature.bash
>#   copyPhoto2part.bash
>
># 01/03/2011: Patrick Morel ajout type_xxx
># 05/03/2011: Patrick Morel ajout sharedPhotoDir et repertoirePhotos
># 17/05/2011: Patrick Morel ajout antiSharedPhotoDir et antiRepertoirePhotos
># 24/05/2011: Patrick Morel ajout repertoireScript, repertoireLog
># 02/01/2012: Patrick Morel Exclusion repExcluThumbs et repExcluOriginalsBackup
>#                           Ajout types AVI, MOV
># 03/01/2012: Patrick Morel repertoireHtml ald ds plusieurs.bash
># 04/01/2012: Patrick Morel definition type images ald ds plusieurs.bash
># 04/01/2012: Patrick Morel rep Log remontÃ© d'1 cran
># 16/02/2012: Patrick Morel QUADRA_F est devenu win_c3 de Mandriva Ã  Mageia
># 05/03/2012: Patrick Morel QUADRA_F replacÃ© sur Mageia via CCM
># 17/04/2012: Patrick Morel Ajout type xcf pour GIMP
># 26/08/2012: Patrick Morel resize480x360 ald resize780x360
># 04/01/2013: Patrick Morel QUADRA2_N ald QUADRA_F + ajout couleurs
># 26/05/2013: Patrick Morel ajout resize2592x1944
># 10/06/2013: Patrick Morel modif savePhotosOnExtDD pour Mageia3, ajout type_ppm
># 12/09/2013: Patrick Morel ajout resize80x60 et resize160x120
># 22/09/2013: Patrick Morel ajout jp2 JP2
># 30/09/2013: Patrick Morel fusion avec commonDefine.include du home
># 23/10/2013: Patrick Morel antiSave* ds archivagePhotosSurDD.bash
># 04/01/2014: Patrick Morel ajout mng MNG, correct. ds typeImage
># 12/01/2014: Patrick Morel utilisation $saveOnExtDD ald en "dur"
># 04/10/2014: Patrick Morel adaptation HPxw9400: photos partagÃ©es
># 10/11/2014: Patrick Morel manquaient des / ds typeImage et typeVideo
># 12/12/2014: Patrick Morel ajout orf ORF (pour RAW Olympus)
># 21/01/2015: Patrick Morel manquaient des / ds typeImage et typeVideo
># 31/01/2015: Patrick Morel ajouts repExclu6="boitesDiapos", sharedConv
>#                           pour sed remplacement variable $anti par variable normale
># 23/03/2015: Patrick Morel ajout repExclu7
># 10/09/2015: Patrick Morel ajout Musique, repertoireMusique, choix DD sauvegarde
># 16/01/2017: PM ajout def_posType, dans nom de l'image, position du type d'image 
>#                d (diapo,) p (photo), v (video), w (web), c (capture d'Ã©cran)
># 05/02/2017: PM ajout ext_jpg, ext_JPG, pointStylus1 et posType ald def_posType
># 26/03/2017: PM ajoutnonCreeSurIpad
># 02/01/2018: PM partage Ã  2048x1536 taille Ipad Air ald 1024x768 pour HPnc6400
># 25/03/2018: PM /mnt/sdd/PhotosPartagees ald /mnt/sdc/PhotosPartagees
># 20/03/2020: PM ajout resize3200x2400 pour Ã©cran QUXGA
># 01/07/2020: PM ajout repertoireDiskcache et def_MULTI-BITMAP
># 05/10/2020: Patrick Morel ajout repExclu8
>
># Couleurs
>noir='\e[0;30m'
>gris='\e[1;30m'
>rougefonce='\e[0;31m'
>rose='\e[1;31m'
>vertfonce='\e[0;32m'
>vertclair='\e[1;32m'
>orange='\e[0;33m'
>jaune='\e[1;33m'
>bleufonce='\e[0;34m'
>bleuclair='\e[1;34m'
>violetfonce='\e[0;35m'
>violetclair='\e[1;35m'
>cyanfonce='\e[0;36m'
>cyanclair='\e[1;36m'
>grisclair='\e[0;37m'
>blanc='\e[1;37m'
>
>neutre='\e[0;m'
>
># dans nommage aaaa-mm-jj-t_nnn_xxxx.jpg
># position du type d'image t
>posType=12
># position du . dans la numÃ©rotation Stylus1
>pointStylus1=21
># 
>#PHOTOS
>def_BMP="format BMP (bitmap) dÃ©veloppÃ© conjointement par Microsoft et IBM"
>def_GIF="format GIF (Graphic Interchange Format)"
>def_JPG="format JPG ou JPEG (Joint Photographic Experts Group)"
>def_JP2="format JP2 ou JPEG 2000 (Joint Photographic Experts Group)"
>def_PNG="format PNG (Portable Network Graphics)"
>def_MNG="format MNG (Multiple-image Network Graphics)"
>def_PPM="format PPM (Portable Pixel Map)"
>def_TIF="format TIF ou TIFF (Tagged Image File Format)"
>#def_MULTI-BITMAP="format jpg_128x96 (Psion Series 5 multi-bitmap image)"
>#echo " Photos brutes de capteur"
>def_CR2="format CR2 (Canon RAW 2)"
>def_NEF="format NEF (Nikon Electronic File)"
>def_ORF="format ORF (Olympus Raw File)"
>#PHOTOS gÃ©olocalisÃ©es
>def_KML="format KML (Keyhole Markup Language) affichage donnÃ©es gÃ©ospatiales ds Google Earth, Google Maps, Google Mobile, World Wind"
>def_KMZ="format KMZ (KML compressÃ©) utilisÃ© par Google"
>#IMAGES GIMP
>def_XCF="format XCF (eXperimental Computing Facility) utilisÃ© par GIMP"
>#VIDEOS
>def_AVI="format AVI (Audio Video Interleave)"
>def_MOV="format MOV propriÃ©taire Apple"
>def_MP4="format MP4 (MPEG-4, Moving Picture Experts Group)"
>def_QT="format QT (QuickTime) propriÃ©taire Apple"
>def_3GP="format 3gp (tÃ©lÃ©phone mobile de troisiÃ¨me gÃ©nÃ©ration dÃ©fini par 3GPP)"
>
># listes pour grep
>typeImage="\.jpg\|\.JPG\|\.jepg\|\.JEPG\|\.jp2\|\.JP2\|\.tif\|\.TIF\|\.tiff\|\.TIFF\|\.cr2\|\.CR2\|\.nef\|\.NEF\|\.kml\|\.KML\|\.kmz\|\.KMZ\|\.xcf\|\.XCF\|\.ppm\|\.PPM\|\.bmp\|\.BMP\|\.gif\|\.GIF\|\.png\|\.PNG\|\.mng\|\.MNG\|\.orf\|\.ORF"
>typeVideo="\.avi\|\.AVI\|\.mov\|\.MOV\|\.mp4\|\.MP4\|\.mpeg4\|\.MPEG4\|\.qt\|\.QT\|\.3gp\|\.3GP"
>typeFichierImage="\.txt\|\.TXT\|\.tmp\|\.TMP"
>
># listes pour for
>#images
>type_jpg="*.jpg *.JPG *.jpeg *.JPEG *.jp2 *.JP2"
>type_tif="*.tif *.TIF *.tiff *.TIFF"
>type_bmp="*.bmp *.BMP"
>type_gif="*.gif *.GIF"
>type_png="*.png *.PNG"
>type_mng="*.mng *.MNG"
>type_cr2="*.cr2 *.CR2"
>type_nef="*.nef *.NEF"
>type_orf="*.orf *.ORF"
>type_kml="*.kml *.KML"
>type_kml="*.kmz *.KMZ"
>type_xcf="*.xcf *.XCF"
>type_ppm="*.ppm *.ppm"
>ext_cr2="cr2"
>ext_CR2="CR2"
>ext_nef="nef"
>ext_NEF="NEF"
>ext_orf="orf"
>ext_ORF="ORF"
>ext_jpg="jpg"
>ext_JPG="JPG"
>
>#vidÃ©os
>type_avi="*.avi *.AVI"
>type_mov="*.mov *.MOV"
>type_mp4="*.mp4 *.MP4 *.mpeg4 *.MPEG4"
>type_qt="*.qt *.QT"
>type_3gp="*.3gp *.3GP"
>
>saveOnExtDD_QUADRA2_N=/run/media/patrick/QUADRA2_N
>saveOnExtDD_QUADRA_F=/run/media/patrick/QUADRA_F
># Choix DD de sauvegarde:
>#saveOnExtDD=$saveOnExtDD_QUADRA_F
>saveOnExtDD=$saveOnExtDD_QUADRA2_N
>
>saveLinux=SauvegardeLinux
>saveWindows=SauvegardeWindows
>saveCommon=SauvegardeCommun
>Musique=Musique
>repertoireMusique=/mnt/sdd/$Musique
>repertoireImages=/mnt/sdc/Images
>repertoirePhotos=/mnt/sdc/Photos
>sharedPhotoDir=/mnt/sdd/PhotosPartagees
>#repertoireImages=/home/patrick/Images
>#repertoirePhotos=/mnt/commun/Photos
>#sharedPhotoDir=/mnt/win_f/PhotosPartagees
>saveImagesOnExtDD=$saveOnExtDD/Images
>savePhotosOnExtDD=$saveOnExtDD/Photos # Mageia3
>#savePhotosOnExtDD=/media/QUADRA_F/Photos # nouveau DD
>#savePhotosOnExtDD=/media/QUADRA_F/Photos
>#savePhotosOnExtDD=/media/win_c3/Photos
>repertoireScript=/home/patrick/script
>
>nonCreeSurIpad="nonCreeSurIpad"
>
>antiRepertoirePhoto=`echo $repertoirePhotos | sed 's/\//\\\\\//g'`
>antiRepertoireImages=`echo $repertoireImages | sed 's/\//\\\\\//g'`
>#antiSharedPhotoDir=`echo $sharedPhotoDir | sed 's/\//\\\\\//g'`
>#antiSavePhotosOnExtDD=`echo $savePhotosOnExtDD | sed 's/\//\\\\\//g'`
>#antiSaveImagesOnExtDD=`echo $saveImagesOnExtDD | sed 's/\//\\\\\//g'`
>
>
># rÃ©pertoires de Photos Ã  exclure
>repExclu="PhotoTmp"
>repExclu1="IndexHtml"
>repExclu2="Doc"
>repExclu3="g10"
>repExclu4="scriptPhoto"
>repExclu5="Orig"
># dus Ã  gpicsync
>repExcluThumbs="thumbs"
>repExcluOriginalsBackup="originals-backup"
># dus Ã  nouvelle organisation
>repExclu6="boitesDiapos"
>repExclu7="GRTMPOEM_FR"
>repExclu8="cache"
>
>repertoireHtml="$repertoirePhotos/$repExclu1"
>repertoireScript="$repertoirePhotos/$repExclu4"
>repertoireLog="$repertoirePhotos/LogPhotos"
>repertoireLogScript="$repertoireScript/LogScript"
>repertoireDiskcache="$repertoirePhotos/PhotoPhones/Nokia5230/microSD2Go_0136-F280/cities/diskcache"
>
>resize80x60="80x60"
>resize160x120="160x120"
>resize320x240="320x240"
>resize480x360="480x360"
>resize640x480="640x480"
>resize800x600="800x600"
>resize1024x768='1024x768'
>resize1152x864="1152x864"
>resize1280x960="1280x960"
>resize1400x1050="1400x1050"
>resize1600x1200="1600x1200"
>resize1920x1440="1920x1440"
>resize2048x1536="2048x1536"
>resize2592x1944="2592x1944"
>resize3200x2400="3200x2400"
>
># RÃ©duction sur rep photos partagÃ©es
># sharedConv=$resize1024x768
>sharedConv=$resize2048x1536

# commonDefine.include
# _fichier de dÃ©finition de variables communes aux fichiers:
#   indexPhotos.bash          
#   comptagePhotos.bash
#   comparePhotoBySignatureLow.bash
#   comparePhotoBySignature.bash
#   copyPhoto2part.bash

# 01/03/2011: Patrick Morel ajout type_xxx
# 05/03/2011: Patrick Morel ajout sharedPhotoDir et repertoirePhotos
# 17/05/2011: Patrick Morel ajout antiSharedPhotoDir et antiRepertoirePhotos
# 24/05/2011: Patrick Morel ajout repertoireScript, repertoireLog
# 02/01/2012: Patrick Morel Exclusion repExcluThumbs et repExcluOriginalsBackup
#                           Ajout types AVI, MOV
# 03/01/2012: Patrick Morel repertoireHtml ald ds plusieurs.bash
# 04/01/2012: Patrick Morel definition type images ald ds plusieurs.bash
# 04/01/2012: Patrick Morel rep Log remontÃ© d'1 cran
# 16/02/2012: Patrick Morel QUADRA_F est devenu win_c3 de Mandriva Ã  Mageia
# 05/03/2012: Patrick Morel QUADRA_F replacÃ© sur Mageia via CCM
# 17/04/2012: Patrick Morel Ajout type xcf pour GIMP
# 26/08/2012: Patrick Morel resize480x360 ald resize780x360
# 04/01/2013: Patrick Morel QUADRA2_N ald QUADRA_F + ajout couleurs
# 26/05/2013: Patrick Morel ajout resize2592x1944
# 10/06/2013: Patrick Morel modif savePhotosOnExtDD pour Mageia3, ajout type_ppm
# 12/09/2013: Patrick Morel ajout resize80x60 et resize160x120
# 22/09/2013: Patrick Morel ajout jp2 JP2
# 30/09/2013: Patrick Morel fusion avec commonDefine.include du home
# 23/10/2013: Patrick Morel antiSave* ds archivagePhotosSurDD.bash
# 04/01/2014: Patrick Morel ajout mng MNG, correct. ds typeImage
# 12/01/2014: Patrick Morel utilisation $saveOnExtDD ald en "dur"
# 04/10/2014: Patrick Morel adaptation HPxw9400: photos partagÃ©es
# 10/11/2014: Patrick Morel manquaient des / ds typeImage et typeVideo
# 12/12/2014: Patrick Morel ajout orf ORF (pour RAW Olympus)
# 21/01/2015: Patrick Morel manquaient des / ds typeImage et typeVideo
# 31/01/2015: Patrick Morel ajouts repExclu6="boitesDiapos", sharedConv
#                           pour sed remplacement variable $anti par variable normale
# 23/03/2015: Patrick Morel ajout repExclu7
# 10/09/2015: Patrick Morel ajout Musique, repertoireMusique, choix DD sauvegarde
# 16/01/2017: PM ajout def_posType, dans nom de l'image, position du type d'image 
#                d (diapo,) p (photo), v (video), w (web), c (capture d'Ã©cran)
# 05/02/2017: PM ajout ext_jpg, ext_JPG, pointStylus1 et posType ald def_posType
# 26/03/2017: PM ajoutnonCreeSurIpad
# 02/01/2018: PM partage Ã  2048x1536 taille Ipad Air ald 1024x768 pour HPnc6400
# 25/03/2018: PM /mnt/sdd/PhotosPartagees ald /mnt/sdc/PhotosPartagees
# 20/03/2020: PM ajout resize3200x2400 pour Ã©cran QUXGA
# 01/07/2020: PM ajout repertoireDiskcache et def_MULTI-BITMAP
# 05/10/2020: Patrick Morel ajout repExclu8

# Couleurs
noir='\e[0;30m'
gris='\e[1;30m'
rougefonce='\e[0;31m'
rose='\e[1;31m'
vertfonce='\e[0;32m'
vertclair='\e[1;32m'
orange='\e[0;33m'
jaune='\e[1;33m'
bleufonce='\e[0;34m'
bleuclair='\e[1;34m'
violetfonce='\e[0;35m'
violetclair='\e[1;35m'
cyanfonce='\e[0;36m'
cyanclair='\e[1;36m'
grisclair='\e[0;37m'
blanc='\e[1;37m'

neutre='\e[0;m'

# dans nommage aaaa-mm-jj-t_nnn_xxxx.jpg
# position du type d'image t
posType=12
# position du . dans la numÃ©rotation Stylus1
pointStylus1=21
# 
#PHOTOS
def_BMP="format BMP (bitmap) dÃ©veloppÃ© conjointement par Microsoft et IBM"
def_GIF="format GIF (Graphic Interchange Format)"
def_JPG="format JPG ou JPEG (Joint Photographic Experts Group)"
def_JP2="format JP2 ou JPEG 2000 (Joint Photographic Experts Group)"
def_PNG="format PNG (Portable Network Graphics)"
def_MNG="format MNG (Multiple-image Network Graphics)"
def_PPM="format PPM (Portable Pixel Map)"
def_TIF="format TIF ou TIFF (Tagged Image File Format)"
#def_MULTI-BITMAP="format jpg_128x96 (Psion Series 5 multi-bitmap image)"
#echo " Photos brutes de capteur"
def_CR2="format CR2 (Canon RAW 2)"
def_NEF="format NEF (Nikon Electronic File)"
def_ORF="format ORF (Olympus Raw File)"
#PHOTOS gÃ©olocalisÃ©es
def_KML="format KML (Keyhole Markup Language) affichage donnÃ©es gÃ©ospatiales ds Google Earth, Google Maps, Google Mobile, World Wind"
def_KMZ="format KMZ (KML compressÃ©) utilisÃ© par Google"
#IMAGES GIMP
def_XCF="format XCF (eXperimental Computing Facility) utilisÃ© par GIMP"
#VIDEOS
def_AVI="format AVI (Audio Video Interleave)"
def_MOV="format MOV propriÃ©taire Apple"
def_MP4="format MP4 (MPEG-4, Moving Picture Experts Group)"
def_QT="format QT (QuickTime) propriÃ©taire Apple"
def_3GP="format 3gp (tÃ©lÃ©phone mobile de troisiÃ¨me gÃ©nÃ©ration dÃ©fini par 3GPP)"

# listes pour grep
typeImage="\.jpg\|\.JPG\|\.jepg\|\.JEPG\|\.jp2\|\.JP2\|\.tif\|\.TIF\|\.tiff\|\.TIFF\|\.cr2\|\.CR2\|\.nef\|\.NEF\|\.kml\|\.KML\|\.kmz\|\.KMZ\|\.xcf\|\.XCF\|\.ppm\|\.PPM\|\.bmp\|\.BMP\|\.gif\|\.GIF\|\.png\|\.PNG\|\.mng\|\.MNG\|\.orf\|\.ORF"
typeVideo="\.avi\|\.AVI\|\.mov\|\.MOV\|\.mp4\|\.MP4\|\.mpeg4\|\.MPEG4\|\.qt\|\.QT\|\.3gp\|\.3GP"
typeFichierImage="\.txt\|\.TXT\|\.tmp\|\.TMP"

# listes pour for
#images
type_jpg="*.jpg *.JPG *.jpeg *.JPEG *.jp2 *.JP2"
type_tif="*.tif *.TIF *.tiff *.TIFF"
type_bmp="*.bmp *.BMP"
type_gif="*.gif *.GIF"
type_png="*.png *.PNG"
type_mng="*.mng *.MNG"
type_cr2="*.cr2 *.CR2"
type_nef="*.nef *.NEF"
type_orf="*.orf *.ORF"
type_kml="*.kml *.KML"
type_kml="*.kmz *.KMZ"
type_xcf="*.xcf *.XCF"
type_ppm="*.ppm *.ppm"
ext_cr2="cr2"
ext_CR2="CR2"
ext_nef="nef"
ext_NEF="NEF"
ext_orf="orf"
ext_ORF="ORF"
ext_jpg="jpg"
ext_JPG="JPG"

#vidÃ©os
type_avi="*.avi *.AVI"
type_mov="*.mov *.MOV"
type_mp4="*.mp4 *.MP4 *.mpeg4 *.MPEG4"
type_qt="*.qt *.QT"
type_3gp="*.3gp *.3GP"

saveOnExtDD_QUADRA2_N=/run/media/patrick/QUADRA2_N
saveOnExtDD_QUADRA_F=/run/media/patrick/QUADRA_F
# Choix DD de sauvegarde:
#saveOnExtDD=$saveOnExtDD_QUADRA_F
saveOnExtDD=$saveOnExtDD_QUADRA2_N

saveLinux=SauvegardeLinux
saveWindows=SauvegardeWindows
saveCommon=SauvegardeCommun
Musique=Musique
repertoireMusique=/mnt/sdd/$Musique
repertoireImages=/mnt/sdc/Images
repertoirePhotos=/mnt/sdc/Photos
sharedPhotoDir=/mnt/sdd/PhotosPartagees
#repertoireImages=/home/patrick/Images
#repertoirePhotos=/mnt/commun/Photos
#sharedPhotoDir=/mnt/win_f/PhotosPartagees
saveImagesOnExtDD=$saveOnExtDD/Images
savePhotosOnExtDD=$saveOnExtDD/Photos # Mageia3
#savePhotosOnExtDD=/media/QUADRA_F/Photos # nouveau DD
#savePhotosOnExtDD=/media/QUADRA_F/Photos
#savePhotosOnExtDD=/media/win_c3/Photos
repertoireScript=/home/patrick/script

nonCreeSurIpad="nonCreeSurIpad"

antiRepertoirePhoto=`echo $repertoirePhotos | sed 's/\//\\\\\//g'`
antiRepertoireImages=`echo $repertoireImages | sed 's/\//\\\\\//g'`
#antiSharedPhotoDir=`echo $sharedPhotoDir | sed 's/\//\\\\\//g'`
#antiSavePhotosOnExtDD=`echo $savePhotosOnExtDD | sed 's/\//\\\\\//g'`
#antiSaveImagesOnExtDD=`echo $saveImagesOnExtDD | sed 's/\//\\\\\//g'`


# rÃ©pertoires de Photos Ã  exclure
repExclu="PhotoTmp"
repExclu1="IndexHtml"
repExclu2="Doc"
repExclu3="g10"
repExclu4="scriptPhoto"
repExclu5="Orig"
# dus Ã  gpicsync
repExcluThumbs="thumbs"
repExcluOriginalsBackup="originals-backup"
# dus Ã  nouvelle organisation
repExclu6="boitesDiapos"
repExclu7="GRTMPOEM_FR"
repExclu8="cache"

repertoireHtml="$repertoirePhotos/$repExclu1"
repertoireScript="$repertoirePhotos/$repExclu4"
repertoireLog="$repertoirePhotos/LogPhotos"
repertoireLogScript="$repertoireScript/LogScript"
repertoireDiskcache="$repertoirePhotos/PhotoPhones/Nokia5230/microSD2Go_0136-F280/cities/diskcache"

resize80x60="80x60"
resize160x120="160x120"
resize320x240="320x240"
resize480x360="480x360"
resize640x480="640x480"
resize800x600="800x600"
resize1024x768='1024x768'
resize1152x864="1152x864"
resize1280x960="1280x960"
resize1400x1050="1400x1050"
resize1600x1200="1600x1200"
resize1920x1440="1920x1440"
resize2048x1536="2048x1536"
resize2592x1944="2592x1944"
resize3200x2400="3200x2400"

# RÃ©duction sur rep photos partagÃ©es
# sharedConv=$resize1024x768
sharedConv=$resize2048x1536

Actions: View

Attachments on bug 27357: 11900 | 11901 | 11902 | 11903 | 11904 | 11905 | 11906 | 11907 | 11908 | 11916 | 11917 | 11921 | 11924 | 11925 | 11926 | 11927 | 11931 | 11932 | 11933 | 11934 | 11959 | 11960 | 13095 | 13231