Merge lp:~zeitgeist/zeitgeist/bluebird_basedir into lp:~zeitgeist/zeitgeist/bluebird

[Seif Lotfy]

This is just a place holder. It should be merged once we are all happy with the results of this one file "constants.vala"

[Michal Hruby (mhr3)]

We don't need gio (File.*), use DirUtils.* functions, join paths with Path.build_filename ()

review: Needs Fixing

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Instead of
Environment.get_user_data_dir () + "/"+ ZEITGEIST_DATA_FOLDER;

Use
Path.build_filename(path1 path2, path3...)

review: Needs Fixing (paths)

[lp:~zeitgeist/zeitgeist/bluebird_basedir]

42. By Seif Lotfy on 2011-07-28

use Path.build_filename instead of +

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Do we need FileTest.IS_DIR
or FileTest.IS_DIR | FileTest.EXISTS ?

[lp:~zeitgeist/zeitgeist/bluebird_basedir]

43. By Seif Lotfy on 2011-07-28

use DirUtils.create instead of (File.*)

[Michal Hruby (mhr3)]

review: Approve

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

review: Approve

[lp:~zeitgeist/zeitgeist/bluebird_basedir]

44. By Seif Lotfy on 2011-07-28

Use env paths if gives else fallback to the datapaths

45. By Seif Lotfy on 2011-07-28

renamed paths and changed removed const from DATABASE_FILE_PATH and DATABASE_FILE_BACKUP_PATH

=== modified file 'src/constants.vala'
--- src/constants.vala	2011-07-27 22:28:45 +0000
+++ src/constants.vala	2011-07-28 14:42:47 +0000
@@ -46,16 +46,21 @@
         // default size is 2000
         public const uint CACHE_SIZE = 0;
 
-        public const string ZEITGEIST_DATA_FOLDER = "zeitgeist";
-
+        public const string ZEITGEIST_DATA_FOLDER = "bluebird";
         public const string ZEITGEIST_DATABASE_FILENAME = "activity.sqlite";
 
         public void initialize ()
         {
             // FIXME: append "/zeitgeist"
-            BASE_DIRECTORY = Environment.get_user_data_dir ();
+            BASE_DIRECTORY = Path.build_filename(Environment.get_user_data_dir (), ZEITGEIST_DATA_FOLDER);
+            // If directory does not exist create directory
+            if (!FileUtils.test (BASE_DIRECTORY, FileTest.IS_DIR)){
+                 DirUtils.create (BASE_DIRECTORY, 0755);
+            }
             DATA_PATH = Environment.get_variable ("ZEITGEIST_DATA_PATH");
-            // FIXME: make sure paths exist
+            
+            stdout.printf("BASE_DIRECTORY = %s\n", BASE_DIRECTORY);
+            stdout.printf("DATA_PATH = %s\n", DATA_PATH);
         }
     }
 }