On the way to respect security policy

4 files changed, 11 insertions, 25 deletions

diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py
index 0ac2bcb..395bd7d 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -315,12 +315,13 @@ class miniTamTamMain(gtk.EventBox):
         self.instrumentPanelBox.remove( self.instrumentPanel )
 
     def micRec(self, widget, mic):
-        os.system('rm ' + Config.SNDS_DIR + '/' + mic)
+        if os.path.isfile(Config.DATA_DIR + '/' + mic):
+            os.system('rm ' + Config.DATA_DIR + '/' + mic)
         self.csnd.inputMessage("i5600 0 4")
-        (s1,o1) = commands.getstatusoutput("arecord -f S16_LE -t wav -r 16000 -d 4 " + Config.SNDS_DIR + "/tempMic.wav")
+        (s1,o1) = commands.getstatusoutput("arecord -f S16_LE -t wav -r 16000 -d 4 " + Config.DATA_DIR + "/tempMic.wav")
         (s2, o2) = commands.getstatusoutput("csound " + Config.FILES_DIR + "/crop.csd")
-        (s3, o3) = commands.getstatusoutput("mv " + Config.SNDS_DIR + "/micTemp " + Config.SNDS_DIR + "/" + mic)
-        (s4, o4) = commands.getstatusoutput("rm " + Config.SNDS_DIR + "/tempMic.wav")
+        (s3, o3) = commands.getstatusoutput("mv " + Config.DATA_DIR + "/micTemp " + Config.DATA_DIR + "/" + mic)
+        (s4, o4) = commands.getstatusoutput("rm " + Config.DATA_DIR + "/tempMic.wav")
         self.micTimeout = gobject.timeout_add(200, self.loadMicInstrument, mic)
         self.instrumentPanel.set_activeInstrument(mic,True)
         self.setInstrument(mic)
diff --git a/TamTamMini.activity/Mini/miniToolbars.py b/TamTamMini.activity/Mini/miniToolbars.py
index 9fac3d6..6401184 100644
--- a/TamTamMini.activity/Mini/miniToolbars.py
+++ b/TamTamMini.activity/Mini/miniToolbars.py
@@ -172,7 +172,7 @@ class LoopSettingsPalette( Palette ):
         self.soundBox = gtk.HBox()
         self.soundLabel = gtk.Label(_('Sound: '))
         self.soundMenuBox = BigComboBox()
-        self.sounds = os.listdir(Config.SNDS_DIR)
+        self.sounds = os.listdir(Config.DATA_DIR)
         for sound in self.sounds:
             self.soundMenuBox.append_item(self.sounds.index(sound), sound)
         self.soundMenuBox.connect('changed', self.handleSound)
@@ -272,7 +272,7 @@ class LoopSettingsPalette( Palette ):
     def handlePopup(self, widget, data=None):
         self.setButtonState()
         self.soundMenuBox.remove_all()
-        self.sounds = os.listdir(Config.SNDS_DIR)
+        self.sounds = os.listdir(Config.DATA_DIR)
         for sound in self.sounds:
             self.soundMenuBox.append_item(self.sounds.index(sound), sound)
         self.nameEntry.set_text("name_of_the_sound")
@@ -283,7 +283,7 @@ class LoopSettingsPalette( Palette ):
 
     def handleSound(self, widget, data=None):
         self.sndname = self.sounds[widget.props.value]
-        fullname = Config.SNDS_DIR + '/' + self.sndname
+        fullname = Config.DATA_DIR + '/' + self.sndname
         results = commands.getstatusoutput("du -b %s" % fullname)
         if results[0] == 0:
             list = results[1].split()
@@ -331,7 +331,7 @@ class LoopSettingsPalette( Palette ):
         ofile.write(category)
         ofile.close()
         if copy:
-            (s,o) = commands.getstatusoutput('cp ' + Config.SNDS_DIR + '/' + oldName + ' ' + Config.SNDS_DIR + '/' + self.sndname)
+            (s,o) = commands.getstatusoutput('cp ' + Config.DATA_DIR + '/' + oldName + ' ' + Config.DATA_DIR + '/' + self.sndname)
 
     def set_values(self, soundLength):
         self.soundLength = soundLength
diff --git a/TamTamMini.activity/TamTamMini.py b/TamTamMini.activity/TamTamMini.py
index 83bf59e..7347f6f 100644
--- a/TamTamMini.activity/TamTamMini.py
+++ b/TamTamMini.activity/TamTamMini.py
@@ -23,7 +23,6 @@ from sugar.activity import activity
 class TamTamMini(activity.Activity):
     def __init__(self, handle):
         activity.Activity.__init__(self, handle)
-        self.ensure_dirs()
 
         color = gtk.gdk.color_parse(Config.WS_BCK_COLOR)
         self.modify_bg(gtk.STATE_NORMAL, color)
@@ -96,7 +95,6 @@ class TamTamMini(activity.Activity):
 
     def onDestroy(self, arg2):
         if Config.DEBUG: print 'DEBUG: TamTam::onDestroy()'
-        os.system('rm -f ' + Config.PREF_DIR + '/synthTemp*')
 
         self.mini.onDestroy()
 
@@ -106,6 +104,7 @@ class TamTamMini(activity.Activity):
 
         gtk.main_quit()
 
+# no more dir created by TamTam
     def ensure_dir(self, dir, perms=0777, rw=os.R_OK|os.W_OK):
         if not os.path.isdir( dir ):
             try:
@@ -115,20 +114,6 @@ class TamTamMini(activity.Activity):
         if not os.access(dir, rw):
             print 'ERROR: directory %s is missing required r/w access\n' % dir
 
-    def ensure_dirs(self):
-        self.ensure_dir(Config.TUNE_DIR)
-        self.ensure_dir(Config.SYNTH_DIR)
-        self.ensure_dir(Config.SNDS_DIR)
-        self.ensure_dir(Config.SNDS_INFO_DIR)
-        self.ensure_dir(Config.SCRATCH_DIR)
-
-        if not os.path.isdir(Config.PREF_DIR):
-            os.mkdir(Config.PREF_DIR)
-            os.system('chmod 0777 ' + Config.PREF_DIR + ' &')
-            for snd in ['mic1','mic2','mic3','mic4','lab1','lab2','lab3','lab4', 'lab5', 'lab6']:
-                shutil.copyfile(Config.SOUNDS_DIR + '/' + snd , Config.SNDS_DIR + '/' + snd)
-                os.system('chmod 0777 ' + Config.SNDS_DIR + '/' + snd + ' &')
-
     def read_file(self,file_path):
         self.metadata['tamtam_subactivity'] = 'mini'
 
diff --git a/TamTamMini.activity/activity/activity.info b/TamTamMini.activity/activity/activity.info
index 5be06e2..0035a31 100644
--- a/TamTamMini.activity/activity/activity.info
+++ b/TamTamMini.activity/activity/activity.info
@@ -3,4 +3,4 @@ name = TamTamMini
 service_name = org.laptop.TamTamMini
 icon = activity-tamtammini
 class = TamTamMini.TamTamMini
-activity_version = 47
\ No newline at end of file
+activity_version = 47