Implement application profile as enum

Author: matzipan

app/src/config.rs.in

@@ -1,7 +1,9 @@
+use crate::controllers::ApplicationProfile;
+
 pub const APP_ID: &str = @APP_ID@;
 pub const GETTEXT_PACKAGE: &str = @GETTEXT_PACKAGE@;
 pub const LOCALEDIR: &str = @LOCALEDIR@;
 pub const PKGDATADIR: &str = @PKGDATADIR@;
-pub const PROFILE: &str = @PROFILE@;
+pub const PROFILE: ApplicationProfile = ApplicationProfile::@PROFILE@;
 pub const RESOURCES_FILE: &str = concat!(@PKGDATADIR@, "/resources.gresource");
 pub const VERSION: &str = @VERSION@;

app/src/controllers/application.rs

@@ -25,6 +25,12 @@ use std::rc::Rc;
 //@TODO find a better place for this
 const TEST_SERVER_EMAIL: &str = "[email protected]";
 
+#[derive(Debug, PartialEq)]
+pub enum ApplicationProfile {
+    Default,
+    Devel,
+}
+
 #[derive(Debug)]
 pub enum ApplicationMessage {
     Setup {},
@@ -697,7 +703,7 @@ impl Application {
 
     pub fn run(&self) -> glib::ExitCode {
         info!("Envoyer ({})", APP_ID);
-        info!("Version: {} ({})", VERSION, PROFILE);
+        info!("Version: {} ({:?})", VERSION, PROFILE);
         info!("Datadir: {}", PKGDATADIR);
 
         ApplicationExtManual::run(self)

app/src/controllers/mod.rs

@@ -2,3 +2,4 @@ mod application;
 
 pub use application::Application;
 pub use application::ApplicationMessage;
+pub use application::ApplicationProfile;

app/src/main.rs

@@ -19,15 +19,16 @@ mod ui;
 #[rustfmt::skip]
 mod config;
 
+use controllers::ApplicationProfile;
 use gettextrs::{gettext, LocaleCategory};
 use gtk::{gio, glib};
 
 use adw;
 use adw::prelude::*;
 
-use self::config::{GETTEXT_PACKAGE, LOCALEDIR, RESOURCES_FILE, PROFILE};
+use self::config::{GETTEXT_PACKAGE, LOCALEDIR, PROFILE, RESOURCES_FILE};
 
-use log::{Level, LevelFilter, Metadata, Record, debug};
+use log::{debug, Level, LevelFilter, Metadata, Record};
 
 struct SimpleLogger;
 
@@ -67,9 +68,9 @@ fn main() -> glib::ExitCode {
 
     let app = controllers::Application::default();
 
-    if PROFILE == "devel" {
+    if PROFILE == ApplicationProfile::Devel {
         debug!("Detected development build");
-        
+
         app.add_main_option(
             "with-test-server",
             b't'.into(),

app/src/meson.build

@@ -1,7 +1,10 @@
+profile = get_option('profile')
+profile_ucfirst = profile[0].to_upper() + profile.substring(1)
+
 global_conf = configuration_data()
 global_conf.set_quoted('APP_ID', application_id)
 global_conf.set_quoted('PKGDATADIR', pkgdatadir)
-global_conf.set_quoted('PROFILE', profile)
+global_conf.set('PROFILE', profile_ucfirst)
 global_conf.set_quoted('VERSION', version + version_suffix)
 global_conf.set_quoted('GETTEXT_PACKAGE', gettext_package)
 global_conf.set_quoted('LOCALEDIR', localedir)

app/src/ui/window.rs

@@ -20,7 +20,7 @@ use std::rc::Rc;
 
 use crate::bindings;
 use crate::config::{APP_ID, PROFILE};
-use crate::controllers::{Application, ApplicationMessage};
+use crate::controllers::{Application, ApplicationMessage, ApplicationProfile};
 use crate::models;
 use crate::models::folder_conversations_list::row_data::ConversationRowData;
 
@@ -115,8 +115,7 @@ mod imp {
             self.parent_constructed();
             let obj = self.obj();
 
-            // Devel Profile
-            if PROFILE == "Devel" {
+            if PROFILE == ApplicationProfile::Devel {
                 obj.add_css_class("devel");
             }
 

meson.build

@@ -36,16 +36,14 @@ podir = meson.project_source_root() / 'po'
 gettext_package = meson.project_name()
 
 if get_option('profile') == 'devel'
-  profile = 'devel'
   vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD', check: false).stdout().strip()
   if vcs_tag == ''
     version_suffix = '-devel'
   else
     version_suffix = '-@0@'.format(vcs_tag)
   endif
-  application_id = '@0@.@1@'.format(base_id, profile)
+  application_id = '@0@.@1@'.format(base_id, get_option('profile'))
 else
-  profile = ''
   version_suffix = ''
   application_id = base_id
 endif