Improved handling of wrong passwords in COD deposition page

finalcif/cif/cod/deposit.py

@@ -42,6 +42,7 @@ def __init__(self, ui: Ui_FinalCifWindow, cif: Union[CifContainer, None], option
         self.ui = ui
         self.settings = FinalCifSettings()
         self._cif = cif
+        self.token_valid = False
         self.options = options
         self._set_checkbox_states()
         self.ui.depositorUsernameLineEdit.textChanged.connect(self._set_username)
@@ -206,8 +207,10 @@ def _refresh_cod_list(self):
 
     def get_structures_from_cod(self):
         f = CODFetcher(main_url=self.main_url)
-        if not self._cod_token:
+        if not self.token_valid:
             self._cod_token = f.get_token(username=self.username, password=self.password)
+            if f.authenticated:
+                self.token_valid = True
         f.get_table_data_by_token(self._cod_token)
         parser = MyCODStructuresParser()
         parser.feed(f.table_html)
@@ -360,6 +363,7 @@ def _set_username(self, text: str):
         self.username = text
 
     def _set_password(self, text: str):
+        self.token_valid = False
         # Do not store this anywhere!
         if len(text) > 4:
             self.ui.refreshDepositListPushButton.setText('Refresh List')

finalcif/cif/cod/deposition_list.py

@@ -11,6 +11,7 @@ class CODFetcher():
     def __init__(self, main_url: str):
         self.table_html = ''
         self.main_url = main_url
+        self.authenticated = False
 
     @property
     def _url(self):
@@ -31,6 +32,8 @@ def get_table_data_by_token(self, token: str):
 
     def _extract_token(self, text: str, token: str = '') -> str:
         for line in text.splitlines():
+            if "Deposited structures" in line:
+                self.authenticated = True
             if 'CODSESSION' in line and '=' in line:
                 token = line.split('=')[-1].split('"')[0]
                 break

finalcif/cif/cod/website_parser.py

@@ -16,8 +16,8 @@ def __init__(self):
     def __repr__(self):
         txt = ''
         for st in self.structures:
-            txt = txt + 'https://www.crystallography.net/cod/information_card.php?id={0}&CODSESSION={1}\n' \
-                .format(st['number'], self.token)
+            txt = txt + (f'https://www.crystallography.net/cod/'
+                         f'information_card.php?id={st["number"]}&CODSESSION={self.token}\n')
         return txt
 
     def init_structure(self) -> Dict[str, Union[str, None]]: