Version permettant des applications externes utilisables.

Author: ejetzer

polygphys/inventaire/__init__.py

@@ -26,30 +26,22 @@
 from ..inventaire.modeles import metadata
 
 logger = logging.getLogger(__name__)
+loggers = [logcfg, logdb, logdt, logdf, logong, logtk]
+log_format = Formats().détails
+niveau = logging.DEBUG
 
 
 def main(dossier=None):
     """Programme de gestion d'inventaire."""
     h = logging.StreamHandler(sys.stdout)
-    f = logging.Formatter(Formats().default)
+    f = logging.Formatter(log_format)
     h.setFormatter(f)
 
     logger.addHandler(h)
-    logcfg.addHandler(h)
-    logdf.addHandler(h)
-    logdt.addHandler(h)
-    logdb.addHandler(h)
-    logong.addHandler(h)
-    logtk.addHandler(h)
-
-    h.setLevel(logging.DEBUG)
-    logger.setLevel(logging.DEBUG)
-    logcfg.setLevel(logging.DEBUG)
-    logdf.setLevel(logging.WARNING)
-    logdt.setLevel(logging.DEBUG)
-    logdb.setLevel(logging.DEBUG)
-    logong.setLevel(logging.WARNING)
-    logtk.setLevel(logging.WARNING)
+    logger.setLevel(niveau)
+    for journal in loggers:
+        journal.addHandler(h)
+        journal.setLevel(niveau)
 
     logger.debug('dossier = %r', dossier)
 
@@ -62,7 +54,7 @@ def main(dossier=None):
             fichier = Path(__file__).expanduser().resolve()
             dossier = fichier.parent
 
-    cfg = dossier / next(dossier.glob('*.cfg'))
+    cfg = dossier / next(x.name for x in dossier.glob('*.cfg'))
     logger.debug('cfg = %r', cfg)
 
     config = FichierConfig(cfg)

polygphys/outils/config.py

@@ -239,20 +239,13 @@ def geturl(self,
         logger.debug('d["netloc"] = %r', d['netloc'])
         if d['netloc'] in ('localhost', '127.0.0.1', ''):
             logger.debug('d["path"] = %r', d['path'])
-            d['path'] = str(Path(d['path'].strip('/')).expanduser())
+            d['path'] = str(Path(d['path']).expanduser())
             logger.debug('d["path"] = %r', d['path'])
 
         if d['nom']:
             d['netloc'] = '@' + d['netloc']
 
-        if not d['netloc'].endswith('/'):
-            d['netloc'] = d['netloc'] + '/'
-        if Path(d['path']).is_absolute():
-            d['netloc'] = d['netloc'] + '//'
-        else:
-            d['netloc'] = d['netloc'] + '/'
-
-        return '{dialect}{driver}://{nom}{mdp}{netloc}{port}\
+        return '{dialect}{driver}://{nom}{mdp}{netloc}{port}/\
 {path}{params}{query}{fragment}'.format(**d)
 
     def getpath(self,
@@ -282,7 +275,7 @@ def getpath(self,
         if champ is None:
             return fallback
 
-        return Path(champ).expanduser().absolute()
+        return Path(champ).expanduser().resolve()
 
     def __str__(self) -> str:
         """

polygphys/outils/database/__init__.py

@@ -650,11 +650,9 @@ def main(dossier: str = None) -> tuple[BaseDeDonnées, sqla.MetaData]:
             dossier = fichier.parent.parent.parent
 
     fichier = dossier / next(dossier.glob('*.db'))
+    logger.info('fichier = %r', fichier)
 
-    if 'sqlite' not in str(fichier):
-        adresse = f'sqlite:///{fichier!s}'
-    else:
-        adresse = fichier
+    adresse = f'sqlite:////{fichier!s}'
 
     logger.info('adresse = %r', adresse)
     base = BaseDeDonnées(adresse, md)

setup.cfg

@@ -2,8 +2,6 @@
     openpyxl
     xlwt
     gitpythonpackages = find:include_package_data = True[options.entry_points]
-gui_scripts =
-    polygphys-heures = polygphys.heures:main
-    polygphys-inventaire = polygphys.inventaire:main
+console_scripts =
     polygphys-demo = polygphys:main
    

setup.py

@@ -8,13 +8,6 @@
 @author: ejetzer
 """
 
-import sys
-
 from setuptools import setup
 
-if sys.platform.startswith('win'):
-    setup_requires = ['py2exe']
-elif sys.platform == 'darwin':
-    setup_requires = ['py2app']
-
-setup(setup_requires=setup_requires)
+setup()