From d2ac5d5ac428bf85b559dcfea25da14864b3f3c2 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Thu, 29 Mar 2018 13:49:01 +0300
Subject: [PATCH] impl of checking the CAID field

---
 app/ui/__init__.py                  |  1 -
 app/ui/service_details_dialog.glade |  3 +++
 app/ui/service_details_dialog.py    | 21 ++++++++++++---------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/ui/__init__.py b/app/ui/__init__.py
index 73820603..e2a34d62 100644
--- a/app/ui/__init__.py
+++ b/app/ui/__init__.py
@@ -1,5 +1,4 @@
 import locale
-
 import gi
 import os
 
diff --git a/app/ui/service_details_dialog.glade b/app/ui/service_details_dialog.glade
index 3f01755c..405bad9f 100644
--- a/app/ui/service_details_dialog.glade
+++ b/app/ui/service_details_dialog.glade
@@ -861,9 +861,12 @@
                       <object class="GtkEntry" id="cas_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="tooltip_text">C:0000,C:a1b2,etc.</property>
                         <property name="width_chars">15</property>
                         <property name="max_width_chars">26</property>
                         <property name="primary_icon_stock">gtk-edit</property>
+                        <property name="placeholder_text" translatable="yes">C:0000,C:a1b2,etc.</property>
+                        <signal name="changed" handler="on_cas_entry_changed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
diff --git a/app/ui/service_details_dialog.py b/app/ui/service_details_dialog.py
index 65f3ead5..324a2a08 100644
--- a/app/ui/service_details_dialog.py
+++ b/app/ui/service_details_dialog.py
@@ -35,10 +35,11 @@ class ServiceDetailsDialog:
         handlers = {"on_system_changed": self.on_system_changed,
                     "on_save": self.on_save,
                     "on_create_new": self.on_create_new,
-                    "on_digit_entry_changed": self.on_digit_entry_changed,
                     "on_tr_edit_toggled": self.on_tr_edit_toggled,
-                    "on_non_empty_entry_changed": self.on_non_empty_entry_changed,
-                    "update_reference": self.update_reference}
+                    "update_reference": self.update_reference,
+                    "on_cas_entry_changed": self.on_cas_entry_changed,
+                    "on_digit_entry_changed": self.on_digit_entry_changed,
+                    "on_non_empty_entry_changed": self.on_non_empty_entry_changed}
 
         builder = Gtk.Builder()
         builder.set_translation_domain(TEXT_DOMAIN)
@@ -59,8 +60,11 @@ class ServiceDetailsDialog:
         self._transponder_services_iters = None
         self._current_model = None
         self._current_itr = None
+        # Patterns
         self._DIGIT_PATTERN = re.compile("\D")
         self._NON_EMPTY_PATTERN = re.compile("(?:^[\s]*$|\D)")
+        self._CAID_PATTERN = re.compile("(?:^[\s]*$)|(C:[0-9a-z]{4})(,C:[0-9a-z]{4})*")
+        # Buttons
         self._apply_button = builder.get_object("apply_button")
         self._create_button = builder.get_object("create_button")
         # style
@@ -283,12 +287,6 @@ class ServiceDetailsDialog:
         """ Sat positions initialisation """
         self._sat_pos_button.set_value(float(sat_pos))
 
-    def get_sat_positions(self, path):
-        try:
-            return ["{:.1f}".format(float(x.position) / 10) for x in get_satellites(path)]
-        except FileNotFoundError:
-            return {r[-4] for r in self._current_model}
-
     def on_system_changed(self, box):
         if not self._tr_edit_switch.get_active():
             return
@@ -515,6 +513,9 @@ class ServiceDetailsDialog:
     def on_non_empty_entry_changed(self, entry):
         entry.set_name(self._DIGIT_ENTRY_NAME if self._NON_EMPTY_PATTERN.search(entry.get_text()) else "GtkEntry")
 
+    def on_cas_entry_changed(self, entry):
+        entry.set_name("GtkEntry" if self._CAID_PATTERN.fullmatch(entry.get_text()) else self._DIGIT_ENTRY_NAME)
+
     def get_value_from_combobox_id(self, box: Gtk.ComboBox, dc: dict):
         cb_id = box.get_active_id()
         return get_key_by_value(dc, cb_id)
@@ -545,6 +546,8 @@ class ServiceDetailsDialog:
         for elem in self._non_empty_elements.values():
             if elem.get_name() == self._DIGIT_ENTRY_NAME:
                 return False
+        if self._cas_entry.get_name() == self._DIGIT_ENTRY_NAME:
+            return False
         return True
 
     def update_reference(self, entry, event=None):