Radicale client URL parameter: simplification

tracim/development.ini.base

@@ -190,7 +190,7 @@ email.notification.smtp.password = your_smtp_password
 # radicale.server.port = 5232
 # radicale.server.ssl = false
 # radicale.server.filesystem.folder = ~/.config/radicale/collections
-# radicale.client.base_url = http://{server_name}:{radicale_port}
+# radicale.client.base_url = http://127.0.0.1:5232
 
 #####
 #

tracim/tracim/config/app_cfg.py

@@ -182,6 +182,12 @@ class CFG(object):
 
         if not self.WEBSITE_SERVER_NAME:
             self.WEBSITE_SERVER_NAME = urlparse(self.WEBSITE_BASE_URL).hostname
+            logger.warning(
+                self,
+                'NOTE: Generated website.server_name parameter from '
+                'website.base_url parameter -> {0}'
+                .format(self.WEBSITE_SERVER_NAME)
+            )
 
         self.WEBSITE_HOME_TAG_LINE = tg.config.get('website.home.tag_line', '')
         self.WEBSITE_SUBTITLE = tg.config.get('website.home.subtitle', '')
@@ -232,10 +238,22 @@ class CFG(object):
             '~/.config/radicale/collections'
         )
 
-        self.RADICALE_CLIENT_BASE_URL_TEMPLATE = tg.config.get(
-            'radicale.client.base_url',
-            'http://{server_name}:{radicale_port}',
-        )
+        self.RADICALE_CLIENT_BASE_URL_TEMPLATE = \
+            tg.config.get('radicale.client.base_url', None)
+
+        if not self.RADICALE_CLIENT_BASE_URL_TEMPLATE:
+            self.RADICALE_CLIENT_BASE_URL_TEMPLATE = \
+                'http://{0}:{1}'.format(
+                    self.WEBSITE_SERVER_NAME,
+                    self.RADICALE_SERVER_PORT,
+                )
+            logger.warning(
+                self,
+                'NOTE: Generated radicale.client.base_url parameter with '
+                'followings parameters: website.server_name, '
+                'radicale.server.port -> {0}'
+                .format(self.RADICALE_CLIENT_BASE_URL_TEMPLATE)
+            )
 
     def get_tracker_js_content(self, js_tracker_file_path = None):
         js_tracker_file_path = tg.config.get('js_tracker_path', None)

tracim/tracim/lib/calendar.py

@@ -35,11 +35,7 @@ class CalendarManager(object):
     def get_base_url(cls):
         from tracim.config.app_cfg import CFG
         cfg = CFG.get_instance()
-
-        return cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE.format(
-            server_name=cfg.WEBSITE_SERVER_NAME,
-            radicale_port=cfg.RADICALE_SERVER_PORT,
-        )
+        return cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE
 
     @classmethod
     def get_user_calendar_url(cls, user_id: int):