Enhance pyperclip warn. Update requirements

Author: ppizarror

pydetex/gui.py

@@ -16,6 +16,7 @@
 
 import ctypes
 import os
+import platform
 import pyperclip
 import requests
 import string
@@ -25,7 +26,7 @@
 from nltk.tokenize import RegexpTokenizer
 from outdated import check_outdated
 from PyMultiDictionary import MultiDictionary
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Callable
 from warnings import warn
 
 sys.path.append('../')
@@ -36,6 +37,7 @@
 import pydetex.utils as ut
 import pydetex.version
 
+from pydetex import __url_bug_tracker__
 from pydetex._fonts import FONT_TAGS
 from pydetex._gui_settings import Settings
 
@@ -138,7 +140,7 @@ def __init__(self) -> None:
         self._tab_spaces = 4
 
         # In text
-        f1 = tk.Frame(self._root, border=0, width=window_size[0], height=window_size[2])
+        f1 = tk.Frame(self._root, width=window_size[0], height=window_size[2])
         f1.pack(fill='both', padx=10)
         f1.pack_propagate(False)
 
@@ -157,7 +159,7 @@ def __init__(self) -> None:
         self._text_in.tab_spaces = self._tab_spaces
 
         # Out text
-        f2 = tk.Frame(self._root, border=0, width=window_size[0], height=window_size[2])
+        f2 = tk.Frame(self._root, width=window_size[0], height=window_size[2])
         f2.pack(fill='both', padx=10, pady=(window_size[3], 0))
         f2.pack_propagate(False)
 
@@ -199,7 +201,7 @@ def __init__(self) -> None:
         # ----------------------------------------------------------------------
         # Status bar
         # ----------------------------------------------------------------------
-        ttk.Separator(self._root, orient='horizontal').pack(side='top', fill='x')
+        ttk.Separator(self._root).pack(side='top', fill='x')
         status_fg = '#999999' if ut.IS_OSX else '#666666'
 
         f4 = tk.Frame(self._root, width=window_size[0], height=26)
@@ -208,27 +210,32 @@ def __init__(self) -> None:
 
         # Detected language
         show_status = 0.2 if window_size[0] > 750 else 0
-        self._status_bar_lang = gui_ut.make_label(f4, w=window_size[0] * (0.4 + (0.2 - show_status)), h=20,
-                                                  side=tk.LEFT, fg=status_fg, bd=0, relief=tk.SUNKEN, anchor=tk.W,
-                                                  pad=(0, 0, 0, 10), separator=True)
+        self._status_bar_lang = gui_ut.make_label(
+            f4, w=window_size[0] * (0.4 + (0.2 - show_status)), h=20,
+            side=tk.LEFT, fg=status_fg, bd=0, relief=tk.SUNKEN, anchor=tk.W,
+            pad=(0, 0, 0, 10), separator=True)
 
         # Status
-        self._status_bar_status = gui_ut.make_label(f4, w=window_size[0] * show_status, h=20, side=tk.LEFT,
-                                                    fg=status_fg, bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5),
-                                                    separator=True)
+        self._status_bar_status = gui_ut.make_label(
+            f4, w=window_size[0] * show_status, h=20, side=tk.LEFT,
+            fg=status_fg, bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5),
+            separator=True)
 
         # Cursor
-        self._status_bar_cursor = gui_ut.make_label(f4, w=window_size[0] * 0.11, h=20, side=tk.LEFT, fg=status_fg,
-                                                    bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5))
+        self._status_bar_cursor = gui_ut.make_label(
+            f4, w=window_size[0] * 0.11, h=20, side=tk.LEFT, fg=status_fg,
+            bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5))
 
         # Cursor selected
-        self._status_bar_cursor_sel = gui_ut.make_label(f4, w=window_size[0] * 0.14, h=20, side=tk.LEFT, fg=status_fg,
-                                                        bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5),
-                                                        separator=True)
+        self._status_bar_cursor_sel = gui_ut.make_label(
+            f4, w=window_size[0] * 0.14, h=20, side=tk.LEFT, fg=status_fg,
+            bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5),
+            separator=True)
 
         # Total processed words
-        self._status_bar_words = gui_ut.make_label(f4, w=window_size[0] * 0.15, h=20, side=tk.LEFT, fg=status_fg,
-                                                   bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5))
+        self._status_bar_words = gui_ut.make_label(
+            f4, w=window_size[0] * 0.15, h=20, side=tk.LEFT, fg=status_fg,
+            bd=0, relief=tk.SUNKEN, anchor=tk.W, pad=(0, 0, 0, 5))
 
         # ----------------------------------------------------------------------
         # Final settings
@@ -240,10 +247,18 @@ def __init__(self) -> None:
         self._clip = True
         try:
             pyperclip.paste()
-        except pyperclip.PyperclipException:
+        except Exception as e:
             self._clip = False
-            error = 'pyperclip is not available on your system (copy/paste mechanism). GUI buttons were disabled'
-            warn(error)
+            pyperclip_error: str = 'pyperclip is not available on your system (copy/paste mechanism). '
+            if os.getenv('XDG_SESSION_TYPE') == 'wayland':
+                pyperclip_error += 'Please install package "wl-clipboard"'
+            elif platform.system() == 'Linux':
+                pyperclip_error += 'On Linux, install "xclip" or "xsel"'
+            else:
+                pyperclip_error += (f'An unrecognized error happened ({e}). '
+                                    f'Please create a new issue on {__url_bug_tracker__}')
+            pyperclip_error += 'GUI buttons have been disabled'
+            warn(pyperclip_error)
             self._process_clip_button['state'] = tk.DISABLED
             self._copy_clip_button['state'] = tk.DISABLED
 
@@ -263,6 +278,21 @@ def __init__(self) -> None:
         self._text_out['state'] = tk.DISABLED
         self._root.update()
 
+    def __after(self, ms: int, func: Callable) -> str:
+        """
+        Executes function after some milliseconds.
+
+        :param ms: Time delay
+        :param func: Function to be executed
+        :return: Call ID
+        """
+        try:
+            # noinspection PyTypeChecker
+            return self._root.after(ms, func)
+        except tk.TclError:
+            pass
+        return ''
+
     def _open_file(self) -> None:
         """
         Opens a file.
@@ -318,7 +348,7 @@ def _status(self, text: str, clear: bool = False, clear_time: int = 500) -> None
             self._root.after_cancel(self._status_clear_event_id)
         self._status_bar_status['text'] = text
         if clear:
-            self._status_clear_event_id = self._root.after(clear_time, self._status_clear)
+            self._status_clear_event_id = self.__after(clear_time, self._status_clear)
 
     def _status_clear(self) -> None:
         """
@@ -339,7 +369,7 @@ def _process_in_key(self, event: 'tk.Event') -> Optional['tk.Event']:
 
         if event.char in string.printable and event.char != '':
             self._status(self._cfg.lang('status_writing'), True, 1000)
-        self._detect_language_event_id = self._root.after(100, self._detect_language)
+        self._detect_language_event_id = self.__after(100, self._detect_language)
         self._process_cursor_in(event)
         return event
 
@@ -350,7 +380,7 @@ def _process_cursor_in(self, event: Optional['tk.Event']) -> Optional['tk.Event'
         :param event: Event
         :return: Event
         """
-        self._root.after(50, self._process_cursor_event)
+        self.__after(50, self._process_cursor_event)
         return event
 
     def _process_focusin_in(self, event: Optional['tk.Event']) -> Optional['tk.Event']:
@@ -460,8 +490,8 @@ def start(self) -> None:
         """
         # noinspection PyProtectedMember
         if self._cfg._last_opened_day_diff >= 7:
-            self._root.after(1000, self._check_version_event)
-        self._root.after(100, lambda: self._root.lift())
+            self.__after(1000, self._check_version_event)
+        self.__after(100, lambda: self._root.lift())
         self._text_in.redraw()
         self._text_out.redraw()
         self._root.mainloop()
@@ -510,7 +540,7 @@ def _process(self) -> None:
             self._root['cursor'] = 'wait'
         except tk.TclError:
             pass
-        self._root.after(1, lambda: self._process_inner())
+        self.__after(1, lambda: self._process_inner())
 
     def _process_inner(self) -> None:
         """

pydetex/parsers.py

@@ -715,7 +715,9 @@ def output_text_for_some_commands(
     # The font format is like .... [font tag]YOUR TAG {[font content]YOUR CONTENT} ...[font normal]. In that case, tag to be
     # relaced is 'YOUR TAG {0}, {1}
     # All *arguments will be formatted using the tag
-    commands: List[Tuple[str, List[Union[int, Tuple[int, bool]]], Union[str, Callable[[str, ...], str]], Optional[str], Optional[str], Tuple[bool, bool]]] = [
+    commands: List[Tuple[
+        str, List[Union[int, Tuple[int, bool]]], Union[str, Callable[[str, ...], str]], Optional[str], Optional[str],  # type: ignore
+        Tuple[bool, bool]]] = [
         ('ac', [1], '{0}', 'normal', 'normal', (False, False)),  # Acronym
         ('acf', [1], '{0}', 'normal', 'normal', (False, False)),  # Acronym
         ('acl', [1], '{0}', 'normal', 'normal', (False, False)),  # Acronym
@@ -732,11 +734,16 @@ def output_text_for_some_commands(
         ('hl', [1], '{0}', 'normal', 'hl', (False, False)),
         ('href', [2], LANG_TT_TAGS.get(lang, 'link'), None, None, (False, False)),
         ('insertimage', [3], LANG_TT_TAGS.get(lang, 'figure_caption'), None, None, (False, True)),  # (Template) Informe
-        ('insertimage', [4], LANG_TT_TAGS.get(lang, 'figure_caption'), None, None, (False, False)),  # (Template) Informe
-        ('insertimageboxed', [4], LANG_TT_TAGS.get(lang, 'figure_caption'), None, None, (False, True)),  # (Template) Informe
-        ('insertimageboxed', [5], LANG_TT_TAGS.get(lang, 'figure_caption'), None, None, (False, True)),  # (Template) Informe
-        ('institutionentry', [1, 2, 3, 4], '{0} ({1}-{2}). {3}', 'normal', 'normal', (False, False)),  # (Template) Professional-CV
-        ('institutionentrynodate', [1, 2], '{0}. {3}', 'normal', 'normal', (False, False)),  # (Template) Professional-CV
+        ('insertimage', [4], LANG_TT_TAGS.get(lang, 'figure_caption'), None, None, (False, False)),
+        # (Template) Informe
+        ('insertimageboxed', [4], LANG_TT_TAGS.get(lang, 'figure_caption'), None, None, (False, True)),
+        # (Template) Informe
+        ('insertimageboxed', [5], LANG_TT_TAGS.get(lang, 'figure_caption'), None, None, (False, True)),
+        # (Template) Informe
+        ('institutionentry', [1, 2, 3, 4], '{0} ({1}-{2}). {3}', 'normal', 'normal', (False, False)),
+        # (Template) Professional-CV
+        ('institutionentrynodate', [1, 2], '{0}. {3}', 'normal', 'normal', (False, False)),
+        # (Template) Professional-CV
         ('lowercase', [1], lambda t: t.lower(), 'normal', 'normal', (False, False)),
         ('MakeLowercase', [1], lambda t: t.lower(), 'normal', 'normal', (False, False)),
         ('MakeUppercase', [1], lambda t: t.upper(), 'normal', 'normal', (False, False)),

pydetex/version.py

@@ -32,6 +32,6 @@ def __str__(self) -> str:
     patch = property(lambda self: self[2])
 
 
-vernum = Version(1, 0, 9)
+vernum = Version(1, 1, 0)
 ver = str(vernum)
 rev = ''

requirements.txt

@@ -1,10 +1,10 @@
-beautifulsoup4 >= 4.12.3
+beautifulsoup4 >= 4.11.1
 flatlatex >= 0.15
 langdetect >= 1.0.9
-nltk == 3.8.1
+nltk >= 3.9.1
 outdated >= 0.2.2
 Pillow >= 9.4.0
-PyMultiDictionary >= 1.2.4
+PyMultiDictionary >= 1.2.5
 pyperclip >= 1.9.0
 requests >= 2.32.3
 tkmacosx >= 1.0.5