PyPtt 2.3.13__tar.gz → 2.3.14__tar.gz

{pyptt-2.3.13 → pyptt-2.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.13
+Version: 2.3.14
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.13 → pyptt-2.3.14}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.3.13'
+__version__ = '2.3.14'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.3.13 → pyptt-2.3.14}/PyPtt/_api_get_time.py

@@ -8,7 +8,7 @@ from . import i18n
 from . import log
 from . import screens
 
-pattern = re.compile(r'[\d]+:[\d][\d]')
+pattern = re.compile(r'(\d{1,2}):(\d{2})')
 
 
 def get_time(api) -> str:
@@ -46,5 +46,6 @@ def _find_time(line_list):
         if '線上' in line:
             result = pattern.search(line)
             if result is not None:
-                return result.group(0)
+                # 10 點前小時不補零 (週六 9:18), 統一回傳 HH:MM
+                return f'{int(result.group(1)):02d}:{result.group(2)}'
     return None

{pyptt-2.3.13 → pyptt-2.3.14}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.13
+Version: 2.3.14
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.13 → pyptt-2.3.14}/tests/test_new_screen_fixes.py

@@ -17,7 +17,7 @@ from unittest.mock import MagicMock
 import pytest
 
 import PyPtt
-from PyPtt import (_api_get_favourite_board, _api_get_newest_index, _api_get_post_list, _api_give_money,
+from PyPtt import (_api_get_favourite_board, _api_get_newest_index, _api_get_time, _api_get_post_list, _api_give_money,
                    _api_util, command, config, connect_core, data_type, exceptions, i18n, screens)
 
 i18n.init(PyPtt.Language.ENGLISH)
@@ -404,3 +404,13 @@ def test_favourites_target_matches(name):
     core.get_screen_queue.return_value = [_fx('favourites_new_p5.txt')]
     _api_get_favourite_board.get_favourite_board(_mock_api(core))
     assert target_list[0].is_match(_fx(name), '>')
+
+
+@pytest.mark.parametrize('bar, expected', [
+    # 10 點前狀態列的小時不補零, get_time 仍要回 HH:MM
+    (' 主選單  [ 獅子時 ]    10/24 週六 9:18 | DeepLearning | 線上23636人    (h)說明 ', '09:18'),
+    (' 主選單  [ 獅子時 ]    10/24 週六 0:05 | DeepLearning | 線上23636人    (h)說明 ', '00:05'),
+    ('主選單   世界郵政日   10/9 週五 15:04 | janice001 | 線上24305人       (h)說明', '15:04'),
+])
+def test_get_time_zero_pads_hour(bar, expected):
+    assert _api_get_time._find_time(['', bar]) == expected