stdin2discord: add verbose logging on query failure. fix logic for long messages

.gitea/workflows/update-list.yaml

@@ -1,14 +0,0 @@
-name: Push commit
-
-on:
-  push:
-  schedule:
-    - cron: "30 * * * *"
-
-jobs:
-  report:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: https://github.com/ischanx/checkout@06c611454073903c9d44641d7e085b21115d3dcf
-
-      - run: DISCORD_WEBHOOK=${{ secrets.DISCORD_WEBHOOK }} bash update_cec_list.bash

list.csv

@@ -59,6 +59,7 @@ _SwingKing_,Не состою (Not in a squadron),N/A
 Советский,EG Pilots,EGPU
 ТАПОК,Star Raccoons,N/A
 "Улитка заходит в бар, но бармен заявляет: ""У нас строгая политика в отношении улиток!"" — и ногой выпихивает ее на улицу. Через неделю улитка возвращается в бар и говорит бармену: ""Ну и нахуя ты это сделал!? А бармен отвечает улитке: Старый морской обычай!",Бан (Banned) (Banned),N/A
+Фокстрот,Close Encounters Corps,SCEC
 ХАМОЛОГ,Close Encounters Corps,SCEC
 Цефея,Close Encounters Corps,SCEC
 Юрмаг,Royal Phoenix Security Group,RPSG
@@ -66,7 +67,7 @@ A-S-T-O-L-F-O,Intragalactic Independent Pilots,N/A
 A.Kai,Не состою (Not in a squadron),N/A
 A'sun,Не состою (Not in a squadron),N/A
 Abaray,Не состою (Not in a squadron),N/A
-Abbat76,Lunar Rising,N/A
+Abbat76,Бан (Banned) (Banned),N/A
 Aberius,Cortex Interstellar Group Armada,N/A
 Abraham_Jay,EG Pilots,EGPU
 Absorbian,Не состою (Not in a squadron),N/A
@@ -325,6 +326,7 @@ Eisem,Не состою (Not in a squadron),N/A
 EkzekutorGraz,Royal Phoenix Security Group,RPSG
 El Mario,Не состою (Not in a squadron),N/A
 EL1GE,Teacoffe Discovery,N/A
+eLCy,Close Encounters Corps,SCEC
 Elfairiwen,Close Encounters Corps,SCEC
 ELITYRA,Не состою (Not in a squadron),N/A
 Ellind,Не состою (Not in a squadron),N/A
@@ -355,6 +357,7 @@ Faizr,Не состою (Not in a squadron),N/A
 Fallout (EG),EG Pilots,EGPU
 FargusTH,EG Pilots,EGPU
 Fartem,Close Encounters Corps,SCEC
+FastShark,Close Encounters Corps,SCEC
 Faustowog,Не состою (Not in a squadron),N/A
 Fc_korolev,Не состою (Not in a squadron),N/A
 fdttrtretre,Не состою (Not in a squadron),N/A
@@ -443,6 +446,7 @@ headshoter123098,Не состою (Not in a squadron),N/A
 HeavenFighter,EG Pilots,EGPU
 hedgeh0g,Не состою (Not in a squadron),N/A
 HelixenQ,Не состою (Not in a squadron),N/A
+HENSON DUVAL,Не состою (Not in a squadron),N/A
 Henta!,Не состою (Not in a squadron),N/A
 Herard Pique,Close Encounters Corps,SCEC
 Hikimon,Не состою (Not in a squadron),N/A
@@ -534,9 +538,11 @@ Khaasa,Не состою (Not in a squadron),N/A
 Kharleks,Не состою (Not in a squadron),N/A
 Kib_kz,Не состою (Not in a squadron),N/A
 Kimaster,Не состою (Not in a squadron),N/A
+Kinobis,Close Encounters Corps,SCEC
 Kirary,EG Pilots,EGPU
 Kirill Sol,EG Pilots,EGPU
 Kirochka,Не состою (Not in a squadron),N/A
+Kissman1975,Close Encounters Corps,SCEC
 Klepto,Не состою (Not in a squadron),N/A
 Klerc,Не состою (Not in a squadron),N/A
 Koi_Hana,Close Encounters Corps,SCEC
@@ -567,11 +573,13 @@ lavaevskiy,Не состою (Not in a squadron),N/A
 Lavas,Не состою (Not in a squadron),N/A
 Lavrentij Palych,Бан (Banned) (Banned),N/A
 LCU No Fool Like One,Canonn,N/A
+LEGION-GETH,Не состою (Not in a squadron),N/A
 LeiLar,Close Encounters Corps,SCEC
 Leorto,Royal Phoenix Security Group,RPSG
 Leshiy13,Royal Phoenix Security Group,RPSG
 Levium,EG Pilots,EGPU
 Lex Kravetski,ICU,N/A
+Lex Miller,Close Encounters Corps,SCEC
 LGenome,Royal Phoenix Security Group,RPSG
 Lieutenant Ellen Ripley,Close Encounters Corps,SCEC
 LilVladDick,Не состою (Not in a squadron),N/A
@@ -584,6 +592,8 @@ Lomorin,Royal Phoenix Security Group,RPSG
 Lonewod,Не состою (Not in a squadron),N/A
 Lorand,Не состою (Not in a squadron),N/A
 Lord Tores,Order Of The Knights Black Wings,N/A
+Lord_Coba,Close Encounters Corps,SCEC
+LuciusFerero,Close Encounters Corps,SCEC
 Lucy Feonix,Не состою (Not in a squadron),N/A
 LUK0629,Lunar Rising,N/A
 Lukatarchik,EG Pilots,EGPU
@@ -732,6 +742,7 @@ Paralexx,Не состою (Not in a squadron),N/A
 pash0k24,Не состою (Not in a squadron),N/A
 PASKUDNICA,Не состою (Not in a squadron),N/A
 pasta50003,Не состою (Not in a squadron),N/A
+PaToom,Close Encounters Corps,SCEC
 Patrin,Close Encounters Corps,SCEC
 Paul Grishem,Close Encounters Corps,SCEC
 PAUL HAMMERHAI,Не состою (Not in a squadron),N/A
@@ -787,6 +798,7 @@ Rednet,Royal Phoenix Security Group,N/A
 REDOWWSKI,Не состою (Not in a squadron),N/A
 Reinforde,Close Encounters Corps,SCEC
 Rendos,Close Encounters Corps,SCEC
+Renesi,Close Encounters Corps,SCEC
 Requese,Intragalactic Independent Pilots,N/A
 RetroPaladin,Не состою (Not in a squadron),N/A
 Revenge of King Blackout,Не состою (Not in a squadron),N/A
@@ -803,6 +815,7 @@ Roman Sharp,Cortex Interstellar Group Armada,N/A
 RomaNSuper,Royal Phoenix Security Group,N/A
 Rombzes,Не состою (Not in a squadron),N/A
 Romerro,Не состою (Not in a squadron),N/A
+Romlin,Close Encounters Corps,SCEC
 Rossteck,Не состою (Not in a squadron),N/A
 Rubass,Не состою (Not in a squadron),N/A
 RufusLynxOne,Close Encounters Corps,SCEC
@@ -816,6 +829,7 @@ Saics,Не состою (Not in a squadron),N/A
 Sanchelo,Не состою (Not in a squadron),N/A
 SandyQwe,Не состою (Not in a squadron),N/A
 Sano Litch,Close Encounters Corps,SCEC
+SANYCHLXG,Close Encounters Corps,SCEC
 SapsanX2,Royal Phoenix Security Group,N/A
 SapsanXT,Royal Phoenix Security Group,N/A
 Saswitz,Royal Phoenix Security Group,N/A
@@ -903,12 +917,14 @@ swatrus,EG Pilots,EGPU
 SWIDLOW,Close Encounters Corps,SCEC
 SWINGKING893,Не состою (Not in a squadron),N/A
 SWL,Не состою (Not in a squadron),N/A
+Syberian Beast,Close Encounters Corps,SCEC
 Syrus Norton,URSA Squadron,N/A
 Syryshev,Royal Phoenix Security Group,N/A
 SyTeR,Не состою (Not in a squadron),N/A
 T4n1s,EG Pilots,EGPU
 Tacticool Raider,Close Encounters Corps,SCEC
 Takuritte,Lunar Rising,N/A
+Tan Dava,Close Encounters Corps,SCEC
 Tayanen,Royal Phoenix Security Group,N/A
 Tchernobog666,EG Pilots,EGPU
 Tel3scop,Бан (Banned) (Banned),N/A
@@ -928,6 +944,7 @@ TheK0tYaRa,Не состою (Not in a squadron),N/A
 Thomas Kavendish,Free Space Rangers,N/A
 Tiberius Gracch,Не состою (Not in a squadron),N/A
 TihongoS,Не состою (Not in a squadron),N/A
+TIHONITO,Close Encounters Corps,SCEC
 Tikus,Не состою (Not in a squadron),N/A
 TIMON72,Close Encounters Corps,SCEC
 TMEPP,Close Encounters Corps,SCEC
@@ -981,23 +998,23 @@ Vitold,EG Pilots,EGPU
 Vizmar,Не состою (Not in a squadron),N/A
 VKazakov,Close Encounters Corps,SCEC
 vladbaid,Не состою (Not in a squadron),N/A
-Vladimir Merkulov,Не состою (Not in a squadron),N/A
+Vladimir Merkulov,Не состою (Not in a squadron),
-VladOFF,Не состою (Not in a squadron),N/A
+VladOFF,Не состою (Not in a squadron),
-vsn80,EG Pilots,EGPU
+vsn80,EG Pilots,
-VSV,Radius Group,N/A
+VSV,Radius Group,
-Vuldemar,Не состою (Not in a squadron),N/A
+Vuldemar,Не состою (Not in a squadron),
-W11Z4RD,KryoTech Imperial Armaments,N/A
+W11Z4RD,KryoTech Imperial Armaments,
-W1Z44RD,KryoTech Imperial Armaments,N/A
+W1Z44RD,KryoTech Imperial Armaments,
-Wanno_Rus,Не состою (Not in a squadron),N/A
+Wanno_Rus,Не состою (Not in a squadron),
-Warrior Sky,Close Encounters Corps,SCEC
+Warrior Sky,Close Encounters Corps,
-Wat4_Dor,Не состою (Not in a squadron),N/A
+Wat4_Dor,Не состою (Not in a squadron),
-Weedmanov,Не состою (Not in a squadron),N/A
+Weedmanov,Не состою (Not in a squadron),
-Wellorn,Close Encounters Corps,SCEC
+Wellorn,Close Encounters Corps,
-WhiteAxe BlackMetal,Не состою (Not in a squadron),N/A
+WhiteAxe BlackMetal,Не состою (Not in a squadron),
-Windows Arinkin,Royal Phoenix Security Group,N/A
+Windows Arinkin,Royal Phoenix Security Group,
-WizardInBlack,Close Encounters Corps,SCEC
+WizardInBlack,Close Encounters Corps,
-Wlad22,Не состою (Not in a squadron),N/A
+Wlad22,Не состою (Not in a squadron),
-Wolf_de_Avataria,Не состою (Not in a squadron),N/A
+Wolf_de_Avataria,Не состою (Not in a squadron),
 WOLFVERINE,Не состою (Not in a squadron),
 Woodlink6,Close Encounters Corps,
 Xaverus,Close Encounters Corps,

stdin2discord.bash

@@ -1,30 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-set -x
-
-send() {
-    local _msg=$1
-    if [[ -z $_msg ]]; then
-        return
-    fi
-
-    curl -X POST \
-        -H "Content-Type: application/json" \
-        -d "{\"content\":\"\`\`\`diff\n$_msg\`\`\`\"}" \
-        "$DISCORD_WEBHOOK"
-}
-
-msg=""
-
-while IFS= read -r line; do
-    line="$(sed 's@"@\\"@g' <<< "$line")"  # Json screening
-    len="$(wc -m <<< "$msg$line")"
-    if [[ $len -ge 1985 ]]; then
-        send "$msg"
-        msg="$line"
-    else
-        msg+="$line\\n"
-    fi
-done
-
-send "$msg"

stdin2discord.py

@@ -0,0 +1,31 @@
+import sys
+import requests
+import os
+
+def send(_msg: str):
+    if len(_msg) == 0:
+        return
+
+    r = requests.post(
+                      url=os.environ['DISCORD_WEBHOOK'],
+                      data=f'content=```diff\n{requests.utils.quote(_msg)}```'.encode('utf-8'),
+                      headers = {'Content-Type': 'application/x-www-form-urlencoded'}
+                     )
+    try:
+        r.raise_for_status()
+
+    except Exception:
+        print(r.text)
+        raise
+
+msg = ''
+
+for line in sys.stdin:
+    if len(msg + line) >= 1900:
+        send(msg)
+        msg = ''
+
+    else:
+        msg += line
+
+send(msg)

update_cec_list.bash

@@ -1,20 +1,28 @@
 #!/usr/bin/bash
 set -euo pipefail
 
+cd "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" || { exit 1; echo "changing directory failed"; exit 1; }
+
 http_response=$(curl -s -L -o list.csv -w "%{http_code}" "https://docs.google.com/spreadsheets/d/e/2PACX-1vTXE8HCavThmJt1Wshy3GyF2ZJ-264SbNRVucsPUe2rbEgpm-e3tqsX-8K2mwsG4ozBj6qUyOOd4RMe/pub?gid=1832580214&single=true&output=csv")
 if [ $http_response != "200" ]; then
 	#echo "page not found"
 	#cat list.csv
-	git reset --hard
+	git reset --hard | grep -v "HEAD is now at"
     exit 1
 
 else
-    git config user.name 'user2'
-    git config user.email 'user2@localhost'
-    git remote set-url origin https://x-access-token:$GITHUB_TOKEN@gitea.demb.uk/$GITHUB_REPOSITORY
     git diff "list.csv"
-    git diff "list.csv" | bash stdin2discord.bash
+    git diff "list.csv" | python3 stdin2discord.py
 	git add "list.csv"
 	git commit -m "commit"
 	git push
 fi
+
+#curl -L -o "list.csv" -s "https://docs.google.com/spreadsheets/d/e/2PACX-1vTXE8HCavThmJt1Wshy3GyF2ZJ-264SbNRVucsPUe2rbEgpm-e3tqsX-8K2mwsG4ozBj6qUyOOd4RMe/pub?gid=1832580214&single=true&output=csv" || { echo "downloading failed"; exit 1; }
+
+#git diff "list.csv"
+#git add "list.csv"
+#git commit -m "commit" | grep -vE 'On branch master|nothing to commit, working tree clean'
+
+
+