Merge lp:~nico44/joliebulle/logging into lp:joliebulle

[Nico]

Ajout de l'utilisation de l'API logging.
Le logging est initialisé au démarrage. Le niveau et le format des traces est paramétrable dans la méthode initLogging(). Par défaut le niveau >=INFO apparait sur la console. Le niveau >=DEBUG apparait dans le fichier joliebulle.log

Pour l'utiliser dans un module il faut ajouter :
import logging
logger = logging.getLogger(__name__)

en début de fichier. Ensuite on peut utiliser logger.debug() logger.info(), logger.warn(), etc. comme décrit ici : http://docs.python.org/py3k/howto/logging.html#logging-from-multiple-modules

=== modified file 'brewCalc.py'
--- brewCalc.py	2012-09-04 22:31:19 +0000
+++ brewCalc.py	2012-09-18 20:38:18 +0000
@@ -25,6 +25,7 @@
 import codecs
 import PyQt4
 import sys
+import logging
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 from base import *
@@ -33,6 +34,8 @@
 from settings import * 
 from globals import *
 
+logger = logging.getLogger(__name__)
+
 
 class CalcBrewday :
 
@@ -85,7 +88,7 @@
             self.infuseVol = 0
             self.newRatio = ratio
         else :
-            print('type non pris en charge')
+            logger.warn('type non pris en charge')
 #        print('actualvol :', actualVol)
 #        print('ratio :', ratio)
 #        print('vm',Vm)

=== modified file 'globals.py'
--- globals.py	2012-09-17 19:38:40 +0000
+++ globals.py	2012-09-18 20:38:18 +0000
@@ -19,6 +19,12 @@
 
 settings = Settings()
 
+#Version Joliebulle à utiliser partout où nécessaire de l'afficher
+# à modifier à chaque release pour :
+#   - retirer le '-DEV' au moment de la livraison
+#   - incrémenter le numéro de version et remettre le '-DEV' au commencement de la nouvelle itération
+VERSION_JOLIBULLE = '2.8.0-DEV' 
+
 if platform == 'win32':
     home_dir = os.path.expanduser("~")
     config_dir = os.path.join(os.path.expanduser("~"), "AppData", "Local", "joliebulle")
@@ -36,9 +42,13 @@
     config_dir = os.path.join(os.path.expanduser("~"), ".config", "joliebulle")
     recettes_dir = settings.conf.value("pathUnix", os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes"))
     database_file = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "database.xml")
-    database_root = os.path.join(os.environ['RESOURCEPATH'], "database.xml")
+    if 'RESOURCEPATH' in os.environ:
+        resourcePath = os.environ['RESOURCEPATH']
+    else:
+        resourcePath = os.getcwd()
+    database_root = os.path.join(resourcePath, "database.xml")
     mash_file = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "mash.xml")
-    mash_root = os.path.join(os.environ['RESOURCEPATH'], "mash.xml")
+    mash_root = os.path.join(resourcePath, "mash.xml")
     samples_dir='Samples'
     samples_target = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes", "Samples")
 

=== modified file 'main.py' (properties changed: +x to -x)
--- main.py	2012-09-18 19:52:34 +0000
+++ main.py	2012-09-18 20:38:18 +0000
@@ -25,6 +25,8 @@
 import os
 import os.path
 import glob
+import logging
+import logging.config
 from sys import platform
 import PyQt4
 import sys
@@ -89,6 +91,40 @@
 #         painter.drawPixmap(option.rect.topLeft(), image)
 #         painter.restore()
 
+def initLogging():
+    config = {
+        'version': 1,              
+        'root': {
+            'handlers': ['console','file'],
+            'level': 'DEBUG'
+        },
+        'disable_existing_loggers': False,
+        'formatters': {
+            'standard': {
+                'format': '%(asctime)s [%(levelname)s] %(name)s: %(message)s'
+            },
+            'detailed': {
+                'format': '%(asctime)s %(module)-17s line:%(lineno)-4d %(levelname)-8s %(message)s'
+            }
+        },
+        'handlers': {
+            'console': {
+                'level':'INFO',
+                'class':'logging.StreamHandler',
+                'stream':'ext://sys.stdout',
+                'formatter':'standard'
+            },
+            'file': {
+                'class':'logging.FileHandler',
+                'level':'DEBUG',
+                'formatter':'detailed',
+                'mode':'a',
+                'filename':os.path.join(config_dir,'joliebulle.log')
+            }  
+        }
+    }
+    logging.config.dictConfig(config)
+
 
 class IngDelegate(QtGui.QItemDelegate):
     def __init__(self, parent=None):
@@ -807,8 +843,8 @@
 
         argumentsList=QtGui.QApplication.arguments()
         if len(argumentsList) > 1 :
-            print("la liste d'arguments:",argumentsList)
-            print("le chemin:",argumentsList[1])
+            logger.debug("la liste d'arguments: %s",argumentsList)
+            logger.debug("le chemin: %s",argumentsList[1])
             # for part in argumentsList :
             #     recipePath=recipePath + " " + part
             try:
@@ -999,7 +1035,7 @@
             
          
             if newName in newFileList :
-                print ('doublon !')
+                logger.debug('doublon !')
                 sameCount= 0 
                 while sameCount < len(newFileNameList) :
                     sameCount = sameCount+1
@@ -1011,7 +1047,7 @@
                         break
             else :
                 newFileList.append(newName) 
-        print("new", newFileList)
+        logger.debug(newFileList)
 
         #on renomme
         # k=0
@@ -1186,7 +1222,7 @@
     def initRep(self) :   
         home = QtCore.QDir(home_dir)
         config = QtCore.QDir(config_dir)
-        print (config)
+        logger.debug (config)
         if not config.exists() :
             home.mkpath (config_dir)
         else :
@@ -1253,7 +1289,7 @@
 
         
     def switchToBrewday(self) :
-        print ("lock",self.brewdayLock)
+        logger.debug ("lock %s",self.brewdayLock)
         self.stackedWidget.setCurrentIndex(4)        
 
         if self.brewdayLock == 1 :
@@ -1465,7 +1501,7 @@
         self.dlgStepBrewday.setModal(True)
         self.dlgStepBrewday.show()
         self.dlgStepBrewday.setFields(self.brewdayCurrentStepTargetTemp, self.brewdayCurrentStepRatio, self.brewdayCurrentStepInfuseAmount, self.brewdayCurrentStepWaterTemp, self.grainWeight, self.stepsListVol, self.brewdayCurrentRow, self.brewdayListTemp, self.strikeTargetTemp)
-        print("envoyé !",self.brewdayCurrentStepTargetTemp,self.strikeTargetTemp )
+        logger.debug("envoyé %s !",self.brewdayCurrentStepTargetTemp,self.strikeTargetTemp )
         
     def purge (self) :
         i = (AppWindow.nbreFer + AppWindow.nbreDivers + AppWindow.nbreHops + self.nbreLevures)
@@ -1498,7 +1534,7 @@
         self.calculs_recette()
         self.MVC()
         
-        print (self.liste_fProportion)
+        logger.debug(self.liste_fProportion)
         
     def ajouterH(self) : 
         
@@ -1654,8 +1690,8 @@
                 pass
             self.calculs_recette()
             self.MVC()
-            print (self.liste_fProportion)
-            print ("index : " , indexLigne)
+            logger.debug(self.liste_fProportion)
+            logger.debug ("index : %s" , indexLigne)
 
         
 
@@ -1966,7 +2002,7 @@
                     
             if self.mashName is not None :       
                 self.currentMash={}
-                print('ouhouh !!!!!')
+                logger.debug('ouhouh !!!!!')
                 self.currentMash['name'] = self.mashName
                 self.currentMash['ph'] = self.mashPh   
                 self.currentMash['grainTemp'] = self.mashGrainTemp
@@ -2018,7 +2054,7 @@
                         dicStep = listSteps[j-1]
                         dicStep['stepVol']= stepVol
                                             
-            print(self.currentMash)
+            logger.debug(self.currentMash)
             if self.mashName is not None :
                 self.mashProfilesBase.listMash.append(self.currentMash)
             else :
@@ -2510,7 +2546,6 @@
         self.switchToEditor()
         self.recipeNotes = self.textEditRecipeNotes.toPlainText()
         
-        
     def recipeNotesRejected (self) :
         self.switchToEditor()
         
@@ -2528,7 +2563,6 @@
         self.currentMash = self.mashProfilesBase.listMash[i]
         self.tableWidgetStepsBrewday_currentRowChanged()
 
-           
         
     def seeMash(self) :
         self.switchToMash()
@@ -2705,7 +2739,7 @@
         self.popMashCombo()
         self.switchToEditor()
         self.comboBoxMashProfiles.setCurrentIndex(i)
-        print(self.currentMash)
+        logger.debug(self.currentMash)
         
     def saveProfile(self) : 
         self.mashProfileExport.export(self.listMash)
@@ -2952,8 +2986,17 @@
             self.webViewBiblio.print(printer)
                 
 
+
 if __name__ == "__main__":
 
+    initLogging()
+
+    logger = logging.getLogger(__name__)
+
+    logger.info("---------------------");
+    logger.info("Jolibulle %s", VERSION_JOLIBULLE);
+
+    logger.debug("Initializing UI");
     QtCore.QTextCodec.setCodecForCStrings(QtCore.QTextCodec.codecForName("utf-8"))
     app = QtGui.QApplication(sys.argv)
     
@@ -2970,4 +3013,9 @@
     main_window = AppWindow()
     main_window.show()
 
+    logger.debug("UI initialized");
+
     app.exec_()
+    logger.info("Joliebulle terminated");
+    logger.info("---------------------");
+

=== modified file 'outilEvaporation.py'
--- outilEvaporation.py	2012-09-04 22:31:19 +0000
+++ outilEvaporation.py	2012-09-18 20:38:18 +0000
@@ -23,10 +23,12 @@
 
 import PyQt4
 import sys
+import logging
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 from outilEvaporation_ui import *
 
+logger = logging.getLogger(__name__)
 
 
 class DialogEvaporation(QtGui.QDialog):
@@ -88,7 +90,7 @@
         self.volPre = ((self.sgFinale * self.volFinal) + (self.volEvap * self.volRefroi)) / self.sgPre
 
 
-        print (self.volPre)
+        logger.debug (self.volPre)
         
         
         

=== modified file 'preferences.py'
--- preferences.py	2012-09-04 22:31:19 +0000
+++ preferences.py	2012-09-18 20:38:18 +0000
@@ -25,6 +25,7 @@
 import codecs
 import PyQt4
 import sys
+import logging
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 from base import *
@@ -35,6 +36,7 @@
 import xml.etree.ElementTree as ET
 from xml.dom import minidom
 
+logger = logging.getLogger(__name__)
 
 
 class DialogPref(QtGui.QDialog):
@@ -88,7 +90,7 @@
             settings.conf.setValue("pathWin32", self.ui.lineEditPathLib.text())
         else :
             settings.conf.setValue("pathUnix", self.ui.lineEditPathLib.text())
-            print (settings.conf.value("pathUnix"))
+            logger.debug(settings.conf.value("pathUnix"))
             
         settings.conf.setValue("BoilOffRate", self.ui.spinBoxBoilOff.value())
         settings.conf.setValue("CoolingLoss", self.ui.spinBoxCooling.value())

=== modified file 'setup.py' (properties changed: +x to -x)