1
0

Compare commits

..

No commits in common. "e87da06111c8dc0fd4b927be93598cb22857b8c2" and "69aef9fb9fb7c4f36788159e5b21ef45505a0e1e" have entirely different histories.

3 changed files with 14 additions and 46 deletions

View File

@ -58,18 +58,12 @@ while true; do
{
echo -e "${VERT}UPLOAD SUR USENET${NORMAL}"
files=( ${FILESANSEXT}.* )
checkusenet
script -q -c \
"nyuu -h ${NG_HOST} -P ${NG_PORT} -S -u ${NG_USER} -p ${NG_PASS} -n ${NG_NBR_CONN} \
-g alt.binaries.boneless -o '${DOSSIER_NZB_ATTENTE}${FILESANSEXT}.nzb' \
--nzb-title '${FILESANSEXT}' \
-f '{rand(14)} {rand(14)}@{rand(5)}.{rand(3)}' \
--message-id '{rand(32)}@{rand(8)}.{rand(3)}' \
--subject '{rand(32)}' --nzb-subject '{filename}' \
--obfuscate-articles ${files[*]} \
--progress=stderr" \
/dev/null
nyuu -h ${NG_HOST} -P ${NG_PORT} -S -u ${NG_USER} -p ${NG_PASS} -n ${NG_NBR_CONN} \
-g alt.binaries.boneless -o "${DOSSIER_NZB_ATTENTE}${FILESANSEXT}.nzb" \
--nzb-title "${FILESANSEXT}" -f "{rand(14)} {rand(14)}@{rand(5)}.{rand(3)}" \
--message-id "{rand(32)}@{rand(8)}.{rand(3)}" \
--subject "{rand(32)}" --nzb-subject "{filename}" --obfuscate-articles ${FILESANSEXT}.*
if [ -e "${DOSSIER_NFO}${FILESANSEXT}.json" ] || [ -e "${DOSSIER_NFO}${FILESANSEXT}.txt" ]; then
echo -e "${JAUNE}VERIF DU NZB${NORMAL}"
@ -116,7 +110,7 @@ while true; do
else
echo -e "${ROUGE}ENVOI SUR LE SITE IMPOSSIBLE NFO MANQUANT${NORMAL}"
fi
} 2>&1 | tee -a "$LOG"
} > >(tee -a "$LOG") 2>&1
fi
else
echo -e "${ROUGE}PROBLEME DE PROPAGATION POST EN PAUSE${NORMAL}"

View File

@ -9,7 +9,6 @@ const os = require('os');
const config = require('./config');
const db = require('./db');
db.testConnection(); // vérification au démarrage
const app = express();
@ -28,14 +27,8 @@ app.use(express.static('public'));
const autopostRouter = express.Router();
app.use('/js', express.static(
path.join(__dirname, '../node_modules/@tailwindcss/browser/dist'),
{ setHeaders: (res) => res.type('application/javascript') } // optionnel
));
app.use('/jquery', express.static(
path.join(__dirname, '../node_modules/jquery/dist'),
{ setHeaders: (res) => res.type('application/javascript') } // optionnel
));
autopostRouter.use('/js', express.static(path.join(__dirname, '../node_modules/@tailwindcss/browser/dist')));
autopostRouter.use('/jquery', express.static(path.join(__dirname, '../node_modules/jquery/dist')));
// --------------------------- Auth non protégée -----------------------------
autopostRouter.get('/login', (req, res) => {
@ -46,7 +39,7 @@ autopostRouter.get('/login', (req, res) => {
<meta charset="UTF-8">
<title>Login</title>
<!-- Inclusion de Tailwind CSS via le CDN -->
<script src="/js/index.global.js"></script>
<script src="js/index.global.js"></script>
</head>
<body class="bg-slate-900 flex items-center justify-center min-h-screen">
<div class="bg-slate-700 p-8 rounded-lg shadow-md w-80">
@ -76,7 +69,6 @@ autopostRouter.post('/login', (req, res) => {
res.send('Identifiants invalides. <a href="/autopost/login">Réessayer</a>');
}
});
autopostRouter.get('/logout', (req, res) => {
req.session.destroy();
res.redirect('/autopost/login');
@ -114,8 +106,8 @@ autopostRouter.get('/', async (req, res) => {
<head>
<meta charset="UTF-8">
<title>Suivi Autopost</title>
<script src="/js/index.global.js"></script>
<script src="/jquery/jquery.min.js"></script>
<script src="js/index.global.js"></script>
<script src="jquery/jquery.min.js"></script>
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&display=swap" rel="stylesheet">
</head>
<body class="bg-slate-900 text-white font-sans p-4">
@ -179,10 +171,6 @@ autopostRouter.get('/', async (req, res) => {
statusText = 'DEJA DISPONIBLE';
statusClass = 'bg-pink-300 text-black font-bold';
break;
case 4:
statusText = 'EN COURS';
statusClass = 'bg-yellow-300 text-black font-bold';
break;
default:
statusText = 'INCONNU';
}
@ -281,10 +269,6 @@ autopostRouter.get('/', async (req, res) => {
statusText = 'DEJA DISPONIBLE';
statusClass = 'bg-pink-300 text-black font-bold';
break;
case 4:
statusText = 'EN COURS';
statusClass = 'bg-yellow-300 text-black font-bold';
break;
default:
statusText = 'INCONNU';
}
@ -436,10 +420,6 @@ autopostRouter.get('/', async (req, res) => {
statusText = 'DEJA DISPONIBLE';
statusClass = 'bg-pink-300 text-black font-bold';
break;
case 4:
statusText = 'EN COURS';
statusClass = 'bg-yellow-300 text-black font-bold';
break;
default:
statusText = 'INCONNU';
}

View File

@ -86,10 +86,7 @@ do_add() {
if [ "$code" = "2" ]; then
echo -e "$ROUGE""$explain""$NORMAL"
db_query "INSERT INTO \`$MYSQL_TABLE\` (nom, status) VALUES ('${release_name}', 3);"
if [ -e "${DOSSIER_GLOBAL}${release_name}" ]; then
rm "${DOSSIER_GLOBAL}""${release_name}"
fi
db_query "INSERT INTO \`release\` (nom, status) VALUES ('${release_name}', 3);"
exit 1
else
echo -e "$VERT""DEPLACEMENT DE LA RELEASE ${release_name} DANS LE REPERTOIRE DE TRAVAIL""$NORMAL"
@ -100,7 +97,7 @@ do_add() {
echo -e "$ROUGE""CREATION MEDIAINFO""$NORMAL"
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 \`$MYSQL_TABLE\` (nom, status) VALUES ('${release_name}', 0);"
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}"
@ -110,7 +107,7 @@ do_add() {
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 \`$MYSQL_TABLE\` (nom, status) VALUES ('${release_name}', 0);"
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
@ -129,9 +126,6 @@ do_check() {
echo -e "${release_name}" "$ROUGE""$explain""$NORMAL"
else
echo -e "${release_name}" "$BLEU""$explain""$NORMAL"
if [ -e "${DOSSIER_GLOBAL}${release_name}" ]; then
rm "${DOSSIER_GLOBAL}""${release_name}"
fi
fi
}