From d15eca5ab7d4460f87b2070cb06e5c3cd99e3194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20M=C3=B6sner?= <filip.mosner@seznam.cz>
Date: Tue, 30 Aug 2022 10:24:37 +0200
Subject: [PATCH] Try fix using enviroments in github workflow

---
 .github/workflows/lang-updates.yml        |  9 ++----
 elevenclock/lang/download_translations.py | 37 ++++++-----------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/lang-updates.yml b/.github/workflows/lang-updates.yml
index 9f73580e..81cab892 100644
--- a/.github/workflows/lang-updates.yml
+++ b/.github/workflows/lang-updates.yml
@@ -8,15 +8,12 @@ jobs:
   main:
     runs-on: windows-latest
     env:
-        TOLGEE_KEY: '${{ secrets.TOLGEE_TOKEN }}' 
-        GIT_KEY: '${{ secrets.GIT_TOKEN }}'
+        TOLGEE_KEY: '${{ secrets.TOLGEE_TOKEN }}'
     steps:
+      - uses: actions/checkout@v3
       - name: Download tolgee translations
         run: |
-          mkdir tempfolder
-          cd tempfolder/
-          git clone https://${Env:GIT_KEY}@github.com/martinet101/ElevenClock/
-          cd ElevenClock/elevenclock/lang
+          cd elevenclock/lang
           git config user.name "Tolgee bot"
           git config user.email "noemail@github.com"
           python download_translations.py --autocommit
diff --git a/elevenclock/lang/download_translations.py b/elevenclock/lang/download_translations.py
index 1a1e6b0e..e22919c4 100644
--- a/elevenclock/lang/download_translations.py
+++ b/elevenclock/lang/download_translations.py
@@ -17,16 +17,11 @@
         print(sys.argv[1])
 
 try:
-    if(isAutoCommit):
-        apikey = os.environ["TOLGEE_KEY"]
-    else:
-        apikey = open("APIKEY.txt", "r").read()
-        print("  API key found in APIKEY.txt")
+    apikey = open("APIKEY.txt", "r").read()
+    print("  API key found in APIKEY.txt")
 except FileNotFoundError:
-    if (isAutoCommit):
-        print("  Error: APIKEY.txt missing")
-        exit(1)
-    else:
+    apikey = os.environ.get("TOLGEE_KEY", "")
+    if (apikey == ""):
         apikey = input("Write api key and press enter: ")
 
 apiurl = f"https://app.tolgee.io/v2/projects/688/export?format=JSON&splitByScope=false&splitByScopeDelimiter=~&splitByScopeDepth=0&filterState=UNTRANSLATED&filterState=TRANSLATED&filterState=REVIEWED&zip=true&ak={apikey}"
@@ -45,36 +40,26 @@
 print()
 print("  Downloading updated translations...")
 
+
 zipcontent = requests.get(apiurl)
 f = open("langs.zip", "wb")
 f.write(zipcontent.content)
-fname = f.name
+langArchiveName = f.name
 f.close()
-print("  Download complete!")
-print()
-
-downloadedLanguages = []
 
-#olddir = "lang_backup"+str(int(time.time()))
-#os.mkdir(olddir)
-#for file in glob.glob('lang_*.json'):
-#    os.remove(file)
-#    shutil.move(file, olddir)
 
-#print(f"  Backup complete. The old files were moved to {olddir}")
-#print()
+print("  Download complete!")
+print()
 print("-------------------------------------------------------")
 print()
 print("  Extracting language files...")
 
 
-print("size of langs.zip:", os.path.getsize(fname))
-
-zip_file = zipfile.ZipFile(fname)
-
 for file in glob.glob('lang_*.json'):
     os.remove(file)
 
+downloadedLanguages = []
+zip_file = zipfile.ZipFile(langArchiveName)
 for name in zip_file.namelist():
     lang = os.path.splitext(name)[0]
     if (lang in languageRemap):
@@ -138,7 +123,6 @@
 f.close()
 
 
-
 print("  Process complete!")
 print()
 print("-------------------------------------------------------")
@@ -176,4 +160,3 @@
         os.system("git reset --hard") # prevent clean
 else:
     os.system("pause")
-