Minor formatting changes
[moonshot-ui.git] / src / moonshot-local-flat-file-store.vala
index 8e4db0a..8281d9d 100644 (file)
@@ -28,7 +28,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
-*/
+ */
 using Gee; 
 
 public class LocalFlatFileStore : Object, IIdentityCardStore {
@@ -37,22 +37,22 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
 
     public void add_card(IdCard card) {
         id_card_list.add(card);
-        store_id_cards ();
+        store_id_cards();
     }
 
     public IdCard? update_card(IdCard card) {
         id_card_list.remove(card);
         id_card_list.add(card);
-        store_id_cards ();
+        store_id_cards();
         foreach(IdCard idcard in id_card_list)
-            if (idcard.display_name == card.display_name)
-                return idcard;
+        if (idcard.display_name == card.display_name)
+            return idcard;
         return null;
     }
 
     public bool remove_card(IdCard card) {
         if (id_card_list.remove(card)) {
-            store_id_cards ();
+            store_id_cards();
             return true;
         }
         return false;
@@ -68,75 +68,75 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
      
     private void load_id_cards() {
         id_card_list.clear();
-        var key_file = new KeyFile ();
-        var path = get_data_dir ();
-        var filename = Path.build_filename (path, FILE_NAME);
+        var key_file = new KeyFile();
+        var path = get_data_dir();
+        var filename = Path.build_filename(path, FILE_NAME);
         
         try {
-            key_file.load_from_file (filename, KeyFileFlags.NONE);
+            key_file.load_from_file(filename, KeyFileFlags.NONE);
         }
         catch (Error e) {
             stdout.printf("Error: %s\n", e.message);
             return;
         }
 
-        var identities_uris = key_file.get_groups ();
+        var identities_uris = key_file.get_groups();
         foreach (string identity in identities_uris) {
             try {
-                IdCard id_card = new IdCard ();
-
-                id_card.issuer = key_file.get_string (identity, "Issuer");
-                id_card.username = key_file.get_string (identity, "Username");
-                id_card.password = key_file.get_string (identity, "Password");
-                id_card.services = key_file.get_string_list (identity, "Services");
-                id_card.display_name = key_file.get_string (identity, "DisplayName");
-                if (key_file.has_key (identity, "StorePassword")) {
-                    id_card.store_password = (key_file.get_string (identity, "StorePassword") == "yes");
+                IdCard id_card = new IdCard();
+
+                id_card.issuer = key_file.get_string(identity, "Issuer");
+                id_card.username = key_file.get_string(identity, "Username");
+                id_card.password = key_file.get_string(identity, "Password");
+                id_card.services = key_file.get_string_list(identity, "Services");
+                id_card.display_name = key_file.get_string(identity, "DisplayName");
+                if (key_file.has_key(identity, "StorePassword")) {
+                    id_card.store_password = (key_file.get_string(identity, "StorePassword") == "yes");
                 } else {
                     id_card.store_password = (id_card.password != null) && (id_card.password != "");
                 }
                 
-                if (key_file.has_key (identity, "Rules-Patterns") &&
-                    key_file.has_key (identity, "Rules-AlwaysConfirm")) {
-                    string [] rules_patterns =    key_file.get_string_list (identity, "Rules-Patterns");
-                    string [] rules_always_conf = key_file.get_string_list (identity, "Rules-AlwaysConfirm");
+                if (key_file.has_key(identity, "Rules-Patterns") &&
+                    key_file.has_key(identity, "Rules-AlwaysConfirm")) {
+                    string [] rules_patterns =    key_file.get_string_list(identity, "Rules-Patterns");
+                    string [] rules_always_conf = key_file.get_string_list(identity, "Rules-AlwaysConfirm");
                     
                     if (rules_patterns.length == rules_always_conf.length) {
-                      Rule[] rules = new Rule[rules_patterns.length];
-                      for (int i = 0; i < rules_patterns.length; i++) {
-                        rules[i] = {rules_patterns[i], rules_always_conf[i]};
-                      }
-                      id_card.rules = rules;
+                        Rule[] rules = new Rule[rules_patterns.length];
+                        for (int i = 0; i < rules_patterns.length; i++) {
+                            rules[i] = {rules_patterns[i], rules_always_conf[i]};
+                        }
+                        id_card.rules = rules;
                     }
                 }
                 
                 // Trust anchor 
-                id_card.trust_anchor.ca_cert = key_file.get_string (identity, "CA-Cert").strip();
-                id_card.trust_anchor.subject = key_file.get_string (identity, "Subject");
-                id_card.trust_anchor.subject_alt = key_file.get_string (identity, "SubjectAlt");
-                id_card.trust_anchor.server_cert = key_file.get_string (identity, "ServerCert");
+                id_card.trust_anchor.ca_cert = key_file.get_string(identity, "CA-Cert").strip();
+                id_card.trust_anchor.subject = key_file.get_string(identity, "Subject");
+                id_card.trust_anchor.subject_alt = key_file.get_string(identity, "SubjectAlt");
+                id_card.trust_anchor.server_cert = key_file.get_string(identity, "ServerCert");
 
-                id_card_list.add (id_card);
+                id_card_list.add(id_card);
             }
             catch (Error e) {
-                stdout.printf ("Error:  %s\n", e.message);
+                stdout.printf("Error:  %s\n", e.message);
             }
         }
     }
 
     private string get_data_dir() {
         string path;
-        path = Path.build_filename (Environment.get_user_data_dir (),
-                                    Config.PACKAGE_TARNAME);
+        path = Path.build_filename(Environment.get_user_data_dir(),
+                                   Config.PACKAGE_TARNAME);
                                     
-        if (!FileUtils.test (path, FileTest.EXISTS)) {
-            DirUtils.create_with_parents (path, 0700);
+        if (!FileUtils.test(path, FileTest.EXISTS)) {
+            DirUtils.create_with_parents(path, 0700);
         }
         return path;
     }
     
-    public void store_id_cards () {
-        var key_file = new KeyFile ();
+    public void store_id_cards() {
+        var key_file = new KeyFile();
         foreach (IdCard id_card in this.id_card_list) {
             /* workaround for Centos vala array property bug: use temp arrays */
             var rules = id_card.rules;
@@ -145,57 +145,57 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
             string[] rules_patterns = new string[rules.length];
             string[] rules_always_conf = new string[rules.length];
             
-            for (int i=0; i<rules.length; i++) {
-              rules_patterns[i] = rules[i].pattern;
-              rules_always_conf[i] = rules[i].always_confirm;
+            for (int i = 0; i < rules.length; i++) {
+                rules_patterns[i] = rules[i].pattern;
+                rules_always_conf[i] = rules[i].always_confirm;
             }
 
-            key_file.set_string (id_card.display_name, "Issuer", id_card.issuer ?? "");
-            key_file.set_string (id_card.display_name, "DisplayName", id_card.display_name ?? "");
-            key_file.set_string (id_card.display_name, "Username", id_card.username ?? "");
+            key_file.set_string(id_card.display_name, "Issuer", id_card.issuer ?? "");
+            key_file.set_string(id_card.display_name, "DisplayName", id_card.display_name ?? "");
+            key_file.set_string(id_card.display_name, "Username", id_card.username ?? "");
             if (id_card.store_password && (id_card.password != null))
-              key_file.set_string (id_card.display_name, "Password", id_card.password);
+                key_file.set_string(id_card.display_name, "Password", id_card.password);
             else
-              key_file.set_string (id_card.display_name, "Password", "");
-            key_file.set_string_list (id_card.display_name, "Services", services ?? empty);
+                key_file.set_string(id_card.display_name, "Password", "");
+            key_file.set_string_list(id_card.display_name, "Services", services ?? empty);
 
             if (rules.length > 0) {
-              key_file.set_string_list (id_card.display_name, "Rules-Patterns", rules_patterns);
-              key_file.set_string_list (id_card.display_name, "Rules-AlwaysConfirm", rules_always_conf);
+                key_file.set_string_list(id_card.display_name, "Rules-Patterns", rules_patterns);
+                key_file.set_string_list(id_card.display_name, "Rules-AlwaysConfirm", rules_always_conf);
             }
-            key_file.set_string (id_card.display_name, "StorePassword", id_card.store_password ? "yes" : "no");
+            key_file.set_string(id_card.display_name, "StorePassword", id_card.store_password ? "yes" : "no");
             
             // Trust anchor 
-            key_file.set_string (id_card.display_name, "CA-Cert", id_card.trust_anchor.ca_cert ?? "");
-            key_file.set_string (id_card.display_name, "Subject", id_card.trust_anchor.subject ?? "");
-            key_file.set_string (id_card.display_name, "SubjectAlt", id_card.trust_anchor.subject_alt ?? "");
-            key_file.set_string (id_card.display_name, "ServerCert", id_card.trust_anchor.server_cert ?? "");
+            key_file.set_string(id_card.display_name, "CA-Cert", id_card.trust_anchor.ca_cert ?? "");
+            key_file.set_string(id_card.display_name, "Subject", id_card.trust_anchor.subject ?? "");
+            key_file.set_string(id_card.display_name, "SubjectAlt", id_card.trust_anchor.subject_alt ?? "");
+            key_file.set_string(id_card.display_name, "ServerCert", id_card.trust_anchor.server_cert ?? "");
         }
 
-        var text = key_file.to_data (null);
+        var text = key_file.to_data(null);
 
         try {
-            var path = get_data_dir ();
-            var filename = Path.build_filename (path, FILE_NAME);
+            var path = get_data_dir();
+            var filename = Path.build_filename(path, FILE_NAME);
             var file  = File.new_for_path(filename);
             var stream = file.replace(null, false, FileCreateFlags.PRIVATE);
-#if GIO_VAPI_USES_ARRAYS
+            #if GIO_VAPI_USES_ARRAYS
             stream.write(text.data);
-#else
+            #else
             var bits = text.data;
             stream.write(&bits[0], bits.length);
-#endif
-        }
+            #endif
+                }
         catch (Error e) {
-            stdout.printf ("Error:  %s\n", e.message);
+            stdout.printf("Error:  %s\n", e.message);
         }
 
         load_id_cards();
     }
 
-     public LocalFlatFileStore () {
+    public LocalFlatFileStore() {
         id_card_list = new LinkedList<IdCard>();
         load_id_cards();
-     }
- }
+    }
+}