...

[iramuteq] / functions.py

diff --git a/functions.py b/functions.py
index 3922fd5..b3fff13 100644 (file)
--- a/functions.py
+++ b/functions.py
@@ -10,6 +10,7 @@ from ConfigParser import ConfigParser
 from subprocess import Popen, call, PIPE
 import thread
 import os
 from subprocess import Popen, call, PIPE
 import thread
 import os

+import ast

 import sys
 import csv
 import platform
 import sys
 import csv
 import platform


@@ -71,14 +72,16 @@ class History :
         sections = self.corpora.keys() + self.analyses.keys()
         parametres = [self.corpora[key] for key in self.corpora.keys()] + [self.analyses[key] for key in self.analyses.keys()]
         self.conf.makeoptions(sections, parametres)
         sections = self.corpora.keys() + self.analyses.keys()
         parametres = [self.corpora[key] for key in self.corpora.keys()] + [self.analyses[key] for key in self.analyses.keys()]
         self.conf.makeoptions(sections, parametres)

+        log.info('write history')

 
     def add(self, analyse) :
         if 'corpus' in analyse :
 
     def add(self, analyse) :
         if 'corpus' in analyse :

-            if analyse['corpus'] in self.corpora :
-                if 'analyses' in self.history[analyse['corpus']] :
-                    self.history[analyse['corpus']]['analyses'].append(analyse)
+            acorpus_uuid =  analyse['corpus']
+            if acorpus_uuid in self.corpora :
+                if 'analyses' in self.history[acorpus_uuid] :
+                    self.history[acorpus_uuid]['analyses'].append(analyse)

                 else :
                 else :

-                    self.history[analyse['corpus']]['analyses'] = [analyse]
+                    self.history[acorpus_uuid]['analyses'] = [analyse]

                 self.analyses[analyse['uuid']] = analyse
             else :
                 self.analyses[analyse['uuid']] = analyse
                 self.analyses[analyse['uuid']] = analyse
             else :
                 self.analyses[analyse['uuid']] = analyse


@@ -87,11 +90,27 @@ class History :
             self.corpora[analyse['uuid']] = analyse
         self.write()
 
             self.corpora[analyse['uuid']] = analyse
         self.write()
 

+    def delete(self, uuid, corpus = False) :
+        if corpus :
+            del self.corpora[uuid]
+            self.conf.conf.remove_section(uuid)
+            for analyse in self.history[uuid].get('analyses', [False]) :
+                if analyse :
+                    del self.analyses[analyse['uuid']]
+                    self.conf.conf.remove_section(analyse['uuid'])
+        else :
+            del self.analyses[uuid]
+            self.conf.conf.remove_section(uuid)
+        self.write()
+

     def addtab(self, analyse) :
         self.opened[analyse['uuid']] = analyse
 
     def rmtab(self, analyse) :
         del self.opened[analyse['uuid']]
     def addtab(self, analyse) :
         self.opened[analyse['uuid']] = analyse
 
     def rmtab(self, analyse) :
         del self.opened[analyse['uuid']]

+    
+    def __str__(self) :
+        return str(self.history)

 
 class DoConf :
     def __init__(self, configfile=None, diff = None, parametres = None) :
 
 class DoConf :
     def __init__(self, configfile=None, diff = None, parametres = None) :


@@ -116,6 +135,12 @@ class DoConf :
         for option in self.conf.options(section) :
             if self.conf.get(section, option).isdigit() :
                 parametres[option] = int(self.conf.get(section, option))
         for option in self.conf.options(section) :
             if self.conf.get(section, option).isdigit() :
                 parametres[option] = int(self.conf.get(section, option))

+            elif self.conf.get(section, option) == 'False' :
+                parametres[option] = False
+            elif self.conf.get(section, option) == 'True' :
+                parametres[option] = True
+            elif self.conf.get(section, option).startswith('(') and self.conf.get(section, option).endswith(')') :
+                parametres[option] = ast.literal_eval(self.conf.get(section, option))

             else :
                 parametres[option] = self.conf.get(section, option)
         if 'type' not in parametres :
             else :
                 parametres[option] = self.conf.get(section, option)
         if 'type' not in parametres :


@@ -131,6 +156,10 @@ class DoConf :
                     self.conf.set(section, option, `parametres[i][option]`)
                 elif isinstance(parametres[i][option], basestring) :
                     self.conf.set(section, option, parametres[i][option].encode('utf8'))
                     self.conf.set(section, option, `parametres[i][option]`)
                 elif isinstance(parametres[i][option], basestring) :
                     self.conf.set(section, option, parametres[i][option].encode('utf8'))

+                elif isinstance(parametres[i][option], wx.Colour) :
+                    self.conf.set(section, option, str(parametres[i][option]))
+                else :
+                    self.conf.set(section, option, `parametres[i][option]`)

         if outfile is None :
             outfile = self.configfile
         with codecs.open(outfile, 'w', 'utf8') as f :
         if outfile is None :
             outfile = self.configfile
         with codecs.open(outfile, 'w', 'utf8') as f :