From ab6695b128c6e75cd02ed2fae24a64a70b4a6a7b Mon Sep 17 00:00:00 2001 From: unfr Date: Thu, 7 Aug 2025 15:30:15 +0200 Subject: [PATCH] Ajour du support des iso via bdinfo --- autopost/posteur.sh | 21 +++++++++++++++------ bin/postauto | 11 ++++++++++- install.sh | 10 ++++++++++ readme.md | 2 +- uninstall.sh | 2 ++ update.sh | 23 +++++++++++++++++++++++ 6 files changed, 61 insertions(+), 8 deletions(-) diff --git a/autopost/posteur.sh b/autopost/posteur.sh index 7ba472c..1503119 100644 --- a/autopost/posteur.sh +++ b/autopost/posteur.sh @@ -65,7 +65,7 @@ while true; do --message-id "{rand(32)}@{rand(8)}.{rand(3)}" \ --subject "{rand(32)}" --nzb-subject "{filename}" --obfuscate-articles ${FILESANSEXT}.* - if [ -e "${DOSSIER_NFO}${FILESANSEXT}.json" ]; then + if [ -e "${DOSSIER_NFO}${FILESANSEXT}.json" ] || [ -e "${DOSSIER_NFO}${FILESANSEXT}.txt" ]; then echo -e "${JAUNE}VERIF DU NZB${NORMAL}" nzbsizebit=$(bash ${ANALYZER} "${DOSSIER_NZB_ATTENTE}${FILESANSEXT}.nzb" | jq '.Taillebit') echo -e "NZB_SIZE : ${nzbsizebit}" @@ -78,11 +78,20 @@ while true; do db_query "UPDATE \`release\` SET status = 2 WHERE id = ${id};" else echo -e "${CYAN}ENVOI SUR LE SITE${NORMAL}" - curl -s -k -L -m 60 --output /dev/null \ - -F rlsname=${FILESANSEXT} \ - -F generated_nfo_json=@${DOSSIER_NFO}${FILESANSEXT}.json \ - -F nzb=@${DOSSIER_NZB_ATTENTE}${FILESANSEXT}.nzb \ - -F upload=upload "${URL_API}${APIKEY}" + if [[ "${name}" =~ \.(iso)$ ]]; then + curl -s -k -L -m 60 --output /dev/null \ + -F rlsname=${FILESANSEXT} \ + -F bdinfo_full=@${DOSSIER_NFO}${FILESANSEXT}.bdinfo.txt \ + -F bdinfo_mini=@${DOSSIER_NFO}${FILESANSEXT}.quicksummary.txt \ + -F nzb=@${DOSSIER_NZB_ATTENTE}${FILESANSEXT}.nzb \ + -F upload=upload "${URL_API}${APIKEY}" + else + curl -s -k -L -m 60 --output /dev/null \ + -F rlsname=${FILESANSEXT} \ + -F generated_nfo_json=@${DOSSIER_NFO}${FILESANSEXT}.json \ + -F nzb=@${DOSSIER_NZB_ATTENTE}${FILESANSEXT}.nzb \ + -F upload=upload "${URL_API}${APIKEY}" + fi first_char=$(echo "${name:0:1}" | tr '[:lower:]' '[:upper:]') mkdir -p "${DOSSIER_NZB_FINAL}${first_char}" 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on \ diff --git a/bin/postauto b/bin/postauto index 9d1db0d..6814a20 100644 --- a/bin/postauto +++ b/bin/postauto @@ -92,12 +92,21 @@ do_add() { mediainfo --output=JSON --full "${DOSSIER_GLOBAL}${release_name}" > "${DOSSIER_NFO}${release_without_ext}.json" echo -e "$CYAN""AJOUT DE LA RELEASE ${release_name} DANS LA DATABASE""$NORMAL" db_query "INSERT INTO \`release\` (nom, status) VALUES ('${release_name}', 0);" + elif [[ "${release_name}" =~ \.(iso)$ ]]; then + if [ ! -e "${DOSSIER_GLOBAL}${release_name}" ]; then + cp -rl "${release_path}" "${DOSSIER_GLOBAL}" + + fi + echo -e "$ROUGE""CREATION BDINFO""$NORMAL" + BDInfo -p "${DOSSIER_GLOBAL}${release_name}" -o "${DOSSIER_NFO}${release_without_ext}.txt" + BDInfoDataSubstractor "${DOSSIER_NFO}${release_without_ext}.txt" + echo -e "$CYAN""AJOUT DE LA RELEASE ${release_name} DANS LA DATABASE""$NORMAL" + db_query "INSERT INTO \`release\` (nom, status) VALUES ('${release_name}', 0);" else echo "il ne s'agit pas d'un fichier mkv ou mp4" fi fi } - do_check() { release_path="$2" release_name=$(basename "$release_path") diff --git a/install.sh b/install.sh index 932a98e..87f76ac 100644 --- a/install.sh +++ b/install.sh @@ -182,6 +182,16 @@ else LISTE_APPLIS+=("$BIN_DIR/7z") fi +#Téléchargement et installation de bdinfo +echo -e "$BLEU""Téléchargement et installation de BDInfo""$NORMAL" +curl -L -o bdinfo_linux_v2.0.6.zip "https://github.com/dotnetcorecorner/BDInfo/releases/download/linux-2.0.6/bdinfo_linux_v2.0.6.zip" +unzip bdinfo_linux_v2.0.6.zip -d "$BIN_DIR" +chmod 777 "$BIN_DIR/BDInfo" +curl -L -o bdinfodatasubstractor_linux_v2.0.6.zip "https://github.com/dotnetcorecorner/BDInfo/releases/download/linux-2.0.6/bdinfodatasubstractor_linux_v2.0.6.zip" +unzip bdinfodatasubstractor_linux_v2.0.6.zip -d "$BIN_DIR" +chmod 777 "$BIN_DIR/BDInfoDataSubstractor" + + # Télécharger et extraire Nyuu echo -e "$BLEU""Téléchargement et installation de nyuu""$NORMAL" NYUU_URL="https://github.com/Antidote2151/Nyuu-Obfuscation/releases/download/v0.4.2-Obfuscate1.3/nyuu-v0.4.2-Obfuscate1.3-linux-amd64.tar.xz" diff --git a/readme.md b/readme.md index 68119e7..401f65e 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ Une fois votre fichier ajouté il sera traité automatiquement. - Création des PAR2 - Post via NYUU ( obfuscation totale) -- ✨Envoi automatique sur le site✨ (avec mediainfo directement ajouté) +- ✨Envoi automatique sur le site✨ (avec MediaInfo/BDInfo directement ajouté) - Suivi sur une page web #### Limitations. diff --git a/uninstall.sh b/uninstall.sh index d630943..5f5d758 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -11,6 +11,8 @@ LISTE_APPLIS=( "$BIN_DIR/nyuu" "$BIN_DIR/parpar" "$BIN_DIR/postauto" + "$BIN_DIR/BDInfo" + "$BIN_DIR/BDInfoDataSubstractor" ) # Vérifier et supprimer les fichiers existants diff --git a/update.sh b/update.sh index c4341db..58b6bfb 100644 --- a/update.sh +++ b/update.sh @@ -266,6 +266,29 @@ else LISTE_APPLIS+=("$BIN_DIR/7z") fi +# Vérifier et installer BDInfo si manquant +if command -v BDInfo > /dev/null 2>&1; then + LISTE_APPLIS+=("BDInfo") +else + echo -e "${ROUGE}BDInfo est manquant. Installation en cours...${NORMAL}" + curl -L -o bdinfo_linux_v2.0.6.zip "https://github.com/dotnetcorecorner/BDInfo/releases/download/linux-2.0.6/bdinfo_linux_v2.0.6.zip" + unzip bdinfo_linux_v2.0.6.zip -d "$BIN_DIR" + chmod 777 "$BIN_DIR/BDInfo" + LISTE_APPLIS+=("$BIN_DIR/BDInfo") +fi + +# Vérifier et installer BDInfo si manquant +if command -v BDInfoDataSubstractor > /dev/null 2>&1; then + LISTE_APPLIS+=("BDInfoDataSubstractor") +else + echo -e "${ROUGE}BDInfoDataSubstractor est manquant. Installation en cours...${NORMAL}" + curl -L -o bdinfodatasubstractor_linux_v2.0.6.zip "https://github.com/dotnetcorecorner/BDInfo/releases/download/linux-2.0.6/bdinfodatasubstractor_linux_v2.0.6.zip" + unzip bdinfodatasubstractor_linux_v2.0.6.zip -d "$BIN_DIR" + chmod 777 "$BIN_DIR/BDInfoDataSubstractor" + LISTE_APPLIS+=("$BIN_DIR/BDInfoDataSubstractor") +fi + + #echo -e "${ROUGE}Merci d'aller lire le readme pour compresser vos anciens NZB${NORMAL}" if [ $updated = "1" ]; then