Add Description field to Web App editor (#339)

* added webapp description entry field

* strip whitespace from webapp description entry

Author: timfeierabend

usr/lib/webapp-manager/common.py

@@ -81,6 +81,7 @@ def __init__(self, path, codename):
         self.codename = codename
         self.web_browser = None
         self.name = None
+        self.desc = None
         self.icon = None
         self.is_valid = False
         self.exec = None
@@ -105,6 +106,12 @@ def __init__(self, path, codename):
                     self.name = line.replace("Name=", "")
                     continue
 
+                if "Comment=" in line:
+                    self.desc = line.replace("Comment=", "")
+                    if self.desc == _("Web App"):
+                        self.desc = ""
+                    continue
+
                 if "Icon=" in line:
                     self.icon = line.replace("Icon=", "")
                     continue
@@ -254,17 +261,20 @@ def delete_webbapp(self, webapp):
             os.remove(falkon_orig_prof_dir)
         shutil.rmtree(os.path.join(FALKON_PROFILES_DIR, webapp.codename), ignore_errors=True)
 
-    def create_webapp(self, name, url, icon, category, browser, custom_parameters, isolate_profile=True, navbar=False, privatewindow=False):
+    def create_webapp(self, name, desc, url, icon, category, browser, custom_parameters, isolate_profile=True, navbar=False, privatewindow=False):
         # Generate a 4 digit random code (to prevent name collisions, so we can define multiple launchers with the same name)
         random_code =  ''.join(choice(string.digits) for _ in range(4))
         codename = "".join(filter(str.isalpha, name)) + random_code
         path = os.path.join(APPS_DIR, "WebApp-%s.desktop" % codename)
 
+        if not desc:
+            desc = _("Web App")
+
         with open(path, 'w') as desktop_file:
             desktop_file.write("[Desktop Entry]\n")
             desktop_file.write("Version=1.0\n")
             desktop_file.write("Name=%s\n" % name)
-            desktop_file.write("Comment=%s\n" % _("Web App"))
+            desktop_file.write("Comment=%s\n" % desc)
 
             exec_string = self.get_exec_string(browser, codename, custom_parameters, icon, isolate_profile, navbar,
                                                privatewindow, url)
@@ -427,13 +437,16 @@ def get_exec_string(self, browser, codename, custom_parameters, icon, isolate_pr
 
         return exec_string
 
-    def edit_webapp(self, path, name, browser, url, icon, category, custom_parameters, codename, isolate_profile, navbar, privatewindow):
+    def edit_webapp(self, path, name, desc, browser, url, icon, category, custom_parameters, codename, isolate_profile, navbar, privatewindow):
+        if not desc:
+            desc = _("Web App")
+
         config = configparser.RawConfigParser()
         config.optionxform = str
         config.read(path)
         config.set("Desktop Entry", "Name", name)
         config.set("Desktop Entry", "Icon", icon)
-        config.set("Desktop Entry", "Comment", _("Web App"))
+        config.set("Desktop Entry", "Comment", desc)
         config.set("Desktop Entry", "Categories", "GTK;%s;" % category)
 
         try:

usr/lib/webapp-manager/webapp-manager.py

@@ -89,6 +89,7 @@ def __init__(self, application):
         self.run_button = self.builder.get_object("run_button")
         self.ok_button = self.builder.get_object("ok_button")
         self.name_entry = self.builder.get_object("name_entry")
+        self.desc_entry = self.builder.get_object("desc_entry")
         self.url_entry = self.builder.get_object("url_entry")
         self.url_label = self.builder.get_object("url_label")
         self.customparameters_entry = self.builder.get_object("customparameters_entry")
@@ -309,6 +310,7 @@ def on_ok_button(self, widget):
         category = self.category_combo.get_model()[self.category_combo.get_active()][CATEGORY_ID]
         browser = self.browser_combo.get_model()[self.browser_combo.get_active()][BROWSER_OBJ]
         name = self.name_entry.get_text()
+        desc = self.desc_entry.get_text().strip()
         url = self.get_url()
         isolate_profile = self.isolated_switch.get_active()
         navbar = self.navbar_switch.get_active()
@@ -322,10 +324,10 @@ def on_ok_button(self, widget):
             shutil.copyfile(icon, new_path)
             icon = new_path
         if self.edit_mode:
-            self.manager.edit_webapp(self.selected_webapp.path, name, browser, url, icon, category, custom_parameters, self.selected_webapp.codename, isolate_profile, navbar, privatewindow)
+            self.manager.edit_webapp(self.selected_webapp.path, name, desc, browser, url, icon, category, custom_parameters, self.selected_webapp.codename, isolate_profile, navbar, privatewindow)
             self.load_webapps()
         else:
-            self.manager.create_webapp(name, url, icon, category, browser, custom_parameters, isolate_profile, navbar,
+            self.manager.create_webapp(name, desc, url, icon, category, browser, custom_parameters, isolate_profile, navbar,
                                        privatewindow)
             self.load_webapps()
 
@@ -351,6 +353,7 @@ def on_add_button(self, widget):
     def on_edit_button(self, widget):
         if self.selected_webapp is not None:
             self.name_entry.set_text(self.selected_webapp.name)
+            self.desc_entry.set_text(self.selected_webapp.desc)
             self.icon_chooser.set_icon(self.selected_webapp.icon)
             self.url_entry.set_text(self.selected_webapp.url)
             self.customparameters_entry.set_text(self.selected_webapp.custom_parameters)