modulitiz-micro 2.29.3__py311-none-any.whl → 2.31.0__py311-none-any.whl

modulitiz_micro/files/git/ModuloGit.py

@@ -1,15 +1,20 @@
 import git
 
+from modulitiz_micro.files.git.decorators.catchAndRaiseGitExceptions import catchAndRaiseGitExceptions
+
 
 class ModuloGit(object):
 	def __init__(self, repoPath:str):
 		self.inner=git.Repo(repoPath)
 	
+	@catchAndRaiseGitExceptions
 	def getWorkingCopyRevision(self)->str:
 		return self.inner.head.object.hexsha
 	
+	@catchAndRaiseGitExceptions
 	def getRemoteRevision(self)->str:
 		return self.inner.remotes[0].fetch()[0].ref.object.hexsha
 	
+	@catchAndRaiseGitExceptions
 	def update(self)->str:
 		return self.inner.remotes[0].pull()[0].ref.object.hexsha

modulitiz_micro/files/git/decorators/catchAndRaiseGitExceptions.py

@@ -0,0 +1,19 @@
+from functools import wraps
+
+from git import GitCommandError
+
+from modulitiz_micro.files.git.exceptions.EccezioneGit import EccezioneGit
+
+
+def catchAndRaiseGitExceptions(funzione):
+	"""
+	Cattura tutte le eccezioni git di vario tipo e rilancia un'eccezione custom
+	"""
+	
+	@wraps(funzione)
+	def wrapped(*args,**kwargs):
+		try:
+			return funzione(*args,**kwargs)
+		except (GitCommandError,) as ex:
+			raise EccezioneGit() from ex
+	return wrapped

modulitiz_micro/files/git/exceptions/EccezioneGit.py

@@ -0,0 +1,7 @@
+from modulitiz_micro.eccezioni.EccezioneBase import EccezioneBase
+
+
+class EccezioneGit(EccezioneBase):
+	
+	def __init__(self,*args,**kwargs):
+		super().__init__(*args,**kwargs)

modulitiz_micro/rete/ModuloNetworking.py

@@ -18,11 +18,14 @@ class ModuloNetworking(object):
 		return mac
 
 	@staticmethod
-	def getIp()->str|None:
+	def getLocalIp()->str|None:
+		"""
+		Returns private local IP address.
+		"""
 		sockObj = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 		sockObj.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-		# doesn't even have to be reachable
 		try:
+			# doesn't even have to be reachable
 			sockObj.connect(('255.255.255.255', 1))
 			indirizzoIp = sockObj.getsockname()[0]
 		except gaierror:

modulitiz_micro/rete/http/ModuloHttp.py

@@ -30,9 +30,10 @@ class ModuloHttp(object):
 	UAS=[UA_MACOS_CHROME,UA_WINDOWS_CHROME,UA_WINDOWS_FIREFOX]
 	
 	URL_CERCA_GOOGLE="https://www.google.it/search?q="
-	URLS_GET_IP=('https://ipecho.net/plain','https://ipinfo.io/ip','https://api.ipify.org')
+	# https://ipecho.net/plain removed because it can return either ipv4 or ipv6 depending on your ISP/Internet connection
+	URLS_GET_IPV4=('https://ipinfo.io/ip','https://api.ipify.org','https://ipv4.seeip.org')
 	
-	REGEX_INDIRIZZO_IP=r"\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b"
+	REGEX_IPV4_ADDRESS=r"\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b"
 	
 	STATUS_OK=200
 	STATUS_OK_PARTIAL_CONTENT=206

modulitiz_micro/rete/http/ModuloHttpUtils.py

@@ -31,8 +31,11 @@ class ModuloHttpUtils(object):
 			return response.status_code==ModuloHttp.STATUS_OK
 	
 	@staticmethod
-	def getIp() -> str|None:
-		url=random.choice(ModuloHttp.URLS_GET_IP)
+	def getIpV4() -> str|None:
+		"""
+		Returns public external IpV4 address.
+		"""
+		url=random.choice(ModuloHttp.URLS_GET_IPV4)
 		http=ModuloHttp(url,None)
 		try:
 			response=http.doGet(2,False)

modulitiz_micro/util/pip/ModuloPip.py

@@ -12,7 +12,7 @@ class ModuloPip(AbstractModuloPip):
 		fileDipendenze=ModuloFiles.pathJoin(percorsoCartellaDipendenze,"requirements.txt")
 		cmd='pip install -U -r "%s"'%(fileDipendenze,)
 		output=ModuloSystem.systemCallReturnOutput(cmd,None)
-		# controllo output
+		# check output
 		righe=ModuloListe.eliminaElementiVuoti(ModuloStringhe.normalizzaEol(output).split("\n"))
 		ultimeRigheReversed=righe[-10:]
 		ultimeRigheReversed.reverse()

modulitiz_micro/util/unittesting/AbstractOverrideTestUtil.py

@@ -1,5 +1,7 @@
 from abc import ABC
 
+from modulitiz_micro.eccezioni.EccezioneRuntime import EccezioneRuntime
+
 
 class AbstractOverrideTestUtil(ABC):
 	"""
@@ -16,3 +18,14 @@ class AbstractOverrideTestUtil(ABC):
 	
 	def __exit__(self,*args,**kwargs):
 		self._cache.clear()
+	
+	@staticmethod
+	def getMockedFunction(throwExc:Exception|None,expectedValue: str|tuple|None):
+		"""
+		Must use only 1 param.
+		"""
+		if throwExc is not None:
+			return lambda *args,**kwargs:(_ for _ in ()).throw(throwExc)
+		elif expectedValue is not None:
+			return lambda *args,**kwargs:expectedValue
+		raise EccezioneRuntime("Use only 1 param")

{modulitiz_micro-2.29.3.dist-info → modulitiz_micro-2.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modulitiz_micro
-Version: 2.29.3
+Version: 2.31.0
 Summary: Raccolta dei miei moduli - versione micro
 Author-email: tiz <sderfo1234@altervista.org>
 Classifier: Programming Language :: Python :: 3

{modulitiz_micro-2.29.3.dist-info → modulitiz_micro-2.31.0.dist-info}/RECORD

@@ -41,7 +41,9 @@ modulitiz_micro/files/cache/CacheBean.py,sha256=EpOPXfg30oLLJ41wD-jTu9RhNCTRtGSl
 modulitiz_micro/files/cache/CacheRam.py,sha256=iozy7AXCs-Tkn1HS_w7wovdzkCtRbyDbb2n9wVe3FPs,990
 modulitiz_micro/files/cache/DatabaseCache.py,sha256=MD0eWEgQhOAmGTbm893rhcc9Nxf_vbr7z2bhqkyQJEk,2391
 modulitiz_micro/files/cache/decorators/cacheRam.py,sha256=FQRzcNWTZKpU9cyrpWIumgg9GKGNBznTmSfok1QgvZM,770
-modulitiz_micro/files/git/ModuloGit.py,sha256=ndgjU4smxINWMEujSQTjxqqfeVWBvueQRkMKKST9siw,383
+modulitiz_micro/files/git/ModuloGit.py,sha256=3GdvP4YpH7NPu5r0rnU37yoY67hj7Y3D09npsNvmTIM,579
+modulitiz_micro/files/git/decorators/catchAndRaiseGitExceptions.py,sha256=qn876kuuLlG7C1hU36AvnG_CJWu2YCcPbXC6xZEjzt4,462
+modulitiz_micro/files/git/exceptions/EccezioneGit.py,sha256=SfBBBvfo7XXJeUYpF61IzxuKAtRsqu1WvB_zsmJkG10,183
 modulitiz_micro/gestionedom/GestioneDom.py,sha256=LjmFKiBLNc0yn9m7Z27u2rpU4UcF9778Ljm8aYhdBcY,1350
 modulitiz_micro/init/AbstractBasicInit.py,sha256=hp2U5ZSIaWtwMuohlsk2WHjPRKxJrQyavPsLPlbejtQ,582
 modulitiz_micro/init/AbstractInit.py,sha256=0dxk2o6Sx3Ii4UzYvIMeWOClxdbmctO3M4XoMpk2v7k,228
@@ -52,13 +54,13 @@ modulitiz_micro/multithreading/ModuloThreadLogger.py,sha256=YMFsiT5G2AAgJfEYACZG
 modulitiz_micro/multithreading/ModuloThreadWithCallbackError.py,sha256=RQWfLDssdVmXoewrWaCdVSrySjbElh2iNBqlSslg0W8,724
 modulitiz_micro/nlp/ModuloNlp.py,sha256=h7ca9kVLKRcqHMK6rCVOambdpPfh-ehVSppP2nYGxVA,799
 modulitiz_micro/nlp/ModuloNlpDateAndTime.py,sha256=QCURYksP4-z_u03CVzcESLp5EtdIx2GNXDNYgYOPGuU,1851
-modulitiz_micro/rete/ModuloNetworking.py,sha256=sNlB90VGNEEUfGbv2y_-CML0Fcw_hVb5N2J8az43vcU,1942
+modulitiz_micro/rete/ModuloNetworking.py,sha256=ouaArJo-sc_eKrTaJW3rzk6zLtNtpfI8YGHQboi_urE,1999
 modulitiz_micro/rete/ModuloOpenVpn.py,sha256=t99ofIYhM7q3HnQrvzQbx-6JeyDQqOc1wvg7pxvYo8U,627
 modulitiz_micro/rete/email/EmailBean.py,sha256=-2FPalluaGUwA8Syj2B7kFzkLVDcZnal_PnfYGIPOkM,196
 modulitiz_micro/rete/email/ModuloEmail.py,sha256=NtlrqlY1TZGr8vGps8frZUft5yReHjtu7CPDKJLSEQ0,2963
-modulitiz_micro/rete/http/ModuloHttp.py,sha256=rPw0hc69502yW3Puh8X0UkNj-yHkk-IdyG6M850Mo48,4472
+modulitiz_micro/rete/http/ModuloHttp.py,sha256=6s8F_NsVUqEoKGRwonBgCoLWlYc4ZH839QJ5eqnSDuY,4593
 modulitiz_micro/rete/http/ModuloHttpConnectionSafe.py,sha256=w1cLQrnPJXltUeJ4OOtFOTPv5k0J6uNqlrXUzO0UbX4,2936
-modulitiz_micro/rete/http/ModuloHttpUtils.py,sha256=yza4I_vonf79Xut0j2NM7gmOgzFb0sSH08k1ev31nTE,2291
+modulitiz_micro/rete/http/ModuloHttpUtils.py,sha256=9r6Z4eT4j4ZH-UyjOQXz_vUaltW-oH9gyyQLZDgVf7s,2350
 modulitiz_micro/rete/http/beans/HttpResponseBean.py,sha256=7JVywcWURv1I9rYKj4Kt9XLt7387wMZGTMefcsm7E3I,202
 modulitiz_micro/rete/http/decorators/catchAndRaiseHttpExceptions.py,sha256=MRhCeNMcy3hw-A8W40gozUY0FiL0tyKASauA7hRW0fo,595
 modulitiz_micro/rete/ntp/AbstractModuloNtp.py,sha256=acwbAPhHz-1nEyxA2PzxLQC-_DKWIir4jy4CJFLA3Tk,2840
@@ -80,7 +82,7 @@ modulitiz_micro/util/beans/globalvar/AbstractBasicGlobalVarBean.py,sha256=had2NW
 modulitiz_micro/util/beans/globalvar/AbstractGlobalVarBean.py,sha256=YrjrR2Ao86yRrqPMVgPV59rtWNex5Nc0BqVdQRqyylM,1372
 modulitiz_micro/util/decorators/noAwait.py,sha256=O9g_-4jSoLUjISslDRMlcvE91OtY2EkqcJKDDZxckDg,536
 modulitiz_micro/util/pip/AbstractModuloPip.py,sha256=JwdRmKMBIk28QctAf8OKR6SrgFfEfacGw3aQMFT-5XM,1254
-modulitiz_micro/util/pip/ModuloPip.py,sha256=748-Vg9R-2vcQz1Ce9d1yExzeNnouYdlRRDceveE9tk,1987
+modulitiz_micro/util/pip/ModuloPip.py,sha256=PhgOdO_jZPJW0J2-Js9fQ3rVFbAks4ZD1oazhx9p1Os,1983
 modulitiz_micro/util/scheduler/AbstractScheduler.py,sha256=JTX39slhcaigiZUUUXKdUed4y0Vhom2Ldi61Zt0LSSE,668
 modulitiz_micro/util/spooler/AbstractSpooler.py,sha256=suJSAdevgZYErqwOTmM9b_fQEZSyJwD2Y11grCFpf5I,295
 modulitiz_micro/util/spooler/Spooler.py,sha256=pAqm-L3KyR7LRuw10RTVqf8DZNiEFS1KeA9q9wuqbz4,430
@@ -88,14 +90,14 @@ modulitiz_micro/util/spooler/beans/QueueBean.py,sha256=HjfK17XpyUUYYXTNS5q56iyBd
 modulitiz_micro/util/spooler/decorators/spooler.py,sha256=lyRWKN7quD57HH_2u584_J1E6pXNGAn7slfUrUQvCas,1858
 modulitiz_micro/util/spooler/eccezioni/EccezioneSpooler.py,sha256=b3uAh2EUrRvFJHaWs7PN-GNP7l0Qn7n2ThEVaVtzWho,169
 modulitiz_micro/util/spooler/eccezioni/EccezioneSpoolerFull.py,sha256=KEcDisixOSkSO9Q9BGoI_IdorFfxeG55Q8w0EOXaaDc,199
-modulitiz_micro/util/unittesting/AbstractOverrideTestUtil.py,sha256=i_zUem-XHmTaYZbq1SXt-txj-RjjO-Fphs7gQGjNA8o,319
+modulitiz_micro/util/unittesting/AbstractOverrideTestUtil.py,sha256=5YX20I-rhl6TpRrqSdNafI1cqBAdTs2sgtOTDjzDn5k,754
 modulitiz_micro/util/unittesting/AbstractTestUtil.py,sha256=AW9mCj8i_qHrigcXcvvjgdLxa-4Ce0jrwJEZqpPVBxY,297
 modulitiz_micro/util/unittesting/ModuloRunUnitTest.py,sha256=_YHxjTk_t9wvlCYgS4HSQ657ht7ekSRQsH7i1aKw1LY,774
 modulitiz_micro/util/wheel/ModuloBuildWheel.py,sha256=-NTUqEjmGl8OUFa1hSwmBbLOaoJZhmzStvOexIN6CDo,5039
 modulitiz_micro/util/wheel/ModuloToml.py,sha256=774GQ8y6lyhOrT0edJPlLq4TBU7Nq4699q74deGlFW4,1205
 modulitiz_micro/util/wheel/ModuloWheel.py,sha256=VRS_6kSt62qubBYzkGm91_GWzcIiD0KlSnaqhM_aQnE,338
-modulitiz_micro-2.29.3.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
-modulitiz_micro-2.29.3.dist-info/METADATA,sha256=_bPILFZsVE9wipqK0rD1mPSKEtvMjj7anmk5cwdLNgU,1651
-modulitiz_micro-2.29.3.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
-modulitiz_micro-2.29.3.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
-modulitiz_micro-2.29.3.dist-info/RECORD,,
+modulitiz_micro-2.31.0.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
+modulitiz_micro-2.31.0.dist-info/METADATA,sha256=YENRtxuTjS0v5NVXm33hsoBPDkWp0OtckjNqXi4y808,1651
+modulitiz_micro-2.31.0.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
+modulitiz_micro-2.31.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
+modulitiz_micro-2.31.0.dist-info/RECORD,,