From 7377625812b4c08c4929090dd40fa7beb751cb98 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Wed, 7 Jun 2023 11:54:38 +0200 Subject: [PATCH] fix bug that only occurs on windows --- bin/__pycache__/handler.cpython-311.pyc | Bin 10711 -> 10822 bytes bin/__pycache__/probe.cpython-311.pyc | Bin 3777 -> 3783 bytes bin/handler.py | 6 +++++- packaging/prepareWindowsPackaging.sh | 2 +- smuL-cli.py | 6 +++++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/__pycache__/handler.cpython-311.pyc b/bin/__pycache__/handler.cpython-311.pyc index 8548fb77f117319c963b97a44b0866513f2625cc..fe5be8ced70240ee1247dc2c1fa29ce2ff407e81 100644 GIT binary patch delta 1102 zcmZ8g&2JM&6yLFp*XvEzj`KxmEPntt4k2|(L5RA!6k!4ZL_#aYGFlwZWW8y;yM5k( z2!|N82Sh8i>8MiG6Q@)q7bKtf2N2>E5E9YeDse$-RnC!GF>j3(sU!KP_wjr4=KcKk z^}^HZ+VB1SQAwQX`8Hh~-_#D0pEvV&$0@1An08LOk*&m8oQA#*API(<_Hclc=+F#{ zZ4pV@7QgNx5{uCT>-~~ciT!ZcFD+K$0f{Lqi5`cBS$thMRNnk+j11yE{18bdhkAr9 zVQlvtsWQxlAC4gFB#r#PTR#SsA5)1*xF&-^lZXr|PL48)oZH^&Vy~a z%%b`gcDuS{T2=lmm?QblKf#n7fDn(XBShhO^%NQ6H`F^?pJ?NS>$bIQ8ldqv>P9#& zLXhQV-(qS2vvQ+mQE~Np>_XR=`Vc5~{_J}aqM9HTB7kLH)U=#6S9fY|1E%nv69^w8 zOe1`Pa8f`kA|U*eNAO)yWa$MVFVG4l~jx z%rqo1Ae+X~;u$&xW9S9a**%hlkN8HiNJ5>*$?pjn=cUxuR7#`)r-liHECNmdVi_dJ z^GB)acubgH&|ofbY zeBqPLrelMt qGCN9UHXwr zqA`)oMLls5qaJ%QCLTF>(!|7M4<1c4Cf>Q|yshX<=9@R)_vY<}Ltw%a*z` zYz|9O+7mhK^6}jnP6c)`SNLcLMn1HFwBUWDg?4>h;iDZZ-I{M1DPi^= ze`r1T<#G2JbHvLtb zZm7+G>diFBD$yC7V$Y&CMX>G$DwbI_bQ)uFY%3sgiVm_DvCFuV{f zl@JBljTmNQ!zne&&KjMB`aD1Z;3z;5V2Xns;voMG+6nXo%clD9RW_SCjgzg-R8KVD z#rbBWTCF#TE>9XVJq$$9&_{~LwF2#dl}{ep$3wK2y_1T#uk}-UgmFLH%wEh6KvytA z6@WniI4q3<=EOan{+z_wS2 z!lP>U@k0hM#2%08Tb=+*rN<4HN}5$Em1quX;Lo~Ye(44N4pxcV!Be^f$|5MS_N6w; z)Fzak^@@#p!=g^jSf#^Iw+t`?umEy|n7Uz-3x@5`^FRbi%}?sYbl9D-+;kQwfs(T3 z9gkjtjsMQQA39aHw2c~>qdFJh>DjZ)9lMuAkq6>k@d^Hf(w|ZKBTBQU%4-2O{sAkZ B#99CV diff --git a/bin/__pycache__/probe.cpython-311.pyc b/bin/__pycache__/probe.cpython-311.pyc index cd2cf334c60e68ac0bb6767b405da7375df88ebd..634b7b57e1552e1910c790e12025dd8e084cd09c 100644 GIT binary patch delta 64 zcmX>odt8=#IWI340}$N*TC$P*6tjeDlvPYder{?^R$^XeaZEu`epYI7NpZ~N*UYk< T@qVf0F-e(uF`Ic=wr~Le$m$lB delta 58 zcmX>udr+2pIWI340}u$ClyBrd#Vls8pOK%Ns-KmZmszY|P?VpQnp{$>Klv@QEUSJ} MW}g0LVU{gi0PwvL-2eap diff --git a/bin/handler.py b/bin/handler.py index e5829e1..859eca8 100755 --- a/bin/handler.py +++ b/bin/handler.py @@ -21,7 +21,11 @@ import time importedModules = {} engineList = os.listdir( 'bin/engines' ); -engineList.pop( 0 ) +counter = 0; +for element in engineList: + if ( element == '__pycache__' ): + engineList.pop( counter ); + counter += 1; for element in engineList: importedModules[ element ] = importlib.import_module( 'bin.engines.' + element + '.' + element ).Scaler() diff --git a/packaging/prepareWindowsPackaging.sh b/packaging/prepareWindowsPackaging.sh index 477ab6e..42fd0fc 100755 --- a/packaging/prepareWindowsPackaging.sh +++ b/packaging/prepareWindowsPackaging.sh @@ -1,4 +1,4 @@ -curl -o ./pythonInstaller.exe https://www.python.org/ftp/python/3.10.11/python-3.10.11-amd64.exe +curl -o ./pythonInstaller.exe https://www.python.org/ftp/python/3.11.3/python-3.11.3-amd64.exe wine pythonInstaller.exe diff --git a/smuL-cli.py b/smuL-cli.py index a817cda..cae66ef 100644 --- a/smuL-cli.py +++ b/smuL-cli.py @@ -14,7 +14,11 @@ import multiprocessing import json engineList = os.listdir( 'bin/engines' ); -engineList.pop( 0 ) +counter = 0; +for element in engineList: + if ( element == '__pycache__' ): + engineList.pop( counter ); + counter += 1; engineInfo = {}