Fixed #68 #84

rachpt · Jan 31, 2021 · cf71add · cf71add
1 parent 9ce9af8
commit cf71add
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lanzou/gui/gui.py b/lanzou/gui/gui.py
@@ -1364,7 +1364,7 @@ def auto_extract_clipboard(self):
         if not self.watch_clipboard:
             return
         text = self.clipboard.text()
-        pat = r"(https?://(\w[-\w]*\.)?lanzou[six].com/[a-z]?[/a-zA-Z0-9]+)[^a-zA-Z0-9]*([a-zA-Z0-9]+)?"
+        pat = r"(https?://(\w[-\w]*\.)?lanzou[six].com/[a-z]?[-/a-zA-Z0-9]+)[^a-zA-Z0-9]*([a-zA-Z0-9]+)?"
         for share_url, _, pwd in re.findall(pat, text):
             if share_url and not self.get_shared_info_thread.isRunning():
                 self.line_share_url.setEnabled(False)

diff --git a/lanzou/gui/workers/share.py b/lanzou/gui/workers/share.py
@@ -22,7 +22,7 @@ def __init__(self, parent=None):
         self.is_folder = ""
         self._mutex = QMutex()
         self._is_work = False
-        self._pat = r"(https?://(\w[-\w]*\.)?lanzou[six].com/[a-z]?[/a-zA-Z0-9]+)[^a-zA-Z0-9]*([a-zA-Z0-9]+\w+)?"
+        self._pat = r"(https?://(\w[-\w]*\.)?lanzou[six].com/[a-z]?[-/a-zA-Z0-9]+)[^a-zA-Z0-9]*([a-zA-Z0-9]+\w+)?"
 
     def set_disk(self, disk):
         self._disk = disk