Merge remote-tracking branch 'origin/recv_timmoc' into recyvan_2

recv/test_recv.py

@@ -4,28 +4,28 @@ import recv
 from sender import sender
 
 
-@patch('builtins.input', side_effect=['./public.pem', 'aes', 'ecb'])
+@patch('builtins.input', side_effect=['../README.md', 'aes', 'ecb'])
 def test_handleLetter_aes_ecb(mock_input):
     letter = sender.main()
     recv.handleLetter(letter)
     pass
 
 
-@patch('builtins.input', side_effect=['./public.pem', 'aes', 'cbc'])
+@patch('builtins.input', side_effect=['../README.md', 'aes', 'cbc'])
 def test_handleLetter_aes_cbc(mock_input):
     letter = sender.main()
     recv.handleLetter(letter)
     pass
 
 
-@patch('builtins.input', side_effect=['./public.pem', 'sm4', 'ecb'])
+@patch('builtins.input', side_effect=['../README.md', 'sm4', 'ecb'])
 def test_handleLetter_sm4_ecb(mock_input):
     letter = sender.main()
     recv.handleLetter(letter)
     pass
 
 
-@patch('builtins.input', side_effect=['./public.pem', 'sm4', 'cbc'])
+@patch('builtins.input', side_effect=['../README.md', 'sm4', 'cbc'])
 def test_handleLetter_sm4_cbc(mock_input):
     letter = sender.main()
     recv.handleLetter(letter)

tool/DownloadPathTool.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import winreg
 from pathlib import Path
@@ -13,8 +14,8 @@ def get_download_directory():
             # 读取 "Downloads" 路径
             download_dir, _ = winreg.QueryValueEx(key, '{374DE290-123F-4565-9164-39C4925E467B}')
 
-            # 将路径从注册表中的格式转换为标准格式
-            download_dir = Path(download_dir).resolve()
+            # 展开环境变量并转换为标准格式
+            download_dir = Path(os.path.expandvars(download_dir)).resolve()
 
         finally:
             # 关闭注册表项