Skip to content

Commit 87738d6

Browse files
committed
v2.3.4 release
1 parent 3873b70 commit 87738d6

File tree

8 files changed

+26
-32
lines changed

8 files changed

+26
-32
lines changed

Movefile Code/Movefile.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
from win32api import GetVolumeInformation
3636
from win32com.client import Dispatch
3737
from win32gui import FindWindow, ShowWindow
38-
from win10toast import ToastNotifier
3938
from winshell import CreateShortcut
4039

4140
import Movefile_icon as icon
4241
from ComBoPicker import Combopicker
4342
from LT_Dic import *
43+
from win10toast_edited import ToastNotifier
4444

4545

4646
class Initialization:
@@ -65,7 +65,7 @@ def __init__(self):
6565
self.first_visit = False
6666
if list_saving_data() == ['', '', '']: # 判断是否为首次访问
6767
self.first_visit = True
68-
logging.info("This is the first visit of this program.")
68+
logging.info("\nThis is the first visit of this program.")
6969

7070
def get_startup_statue(self):
7171
if "--startup_visit" in sys.argv:
@@ -738,7 +738,7 @@ def cf_autorun_operation():
738738
check__mode=cf_file.getint(save_name, 'mode'),
739739
is__move__folder=cf_file.get(save_name, 'move_folder'))
740740
logging.info(
741-
f'Automatically ran Cleanfile operation as config "{save_name}"')
741+
f'\nAutomatically ran Cleanfile operation as config "{save_name}"')
742742

743743

744744
def sf_sync_dir(path1, path2, single_sync, language_number, area_name=None, pass_file_paths='', pass_folder_paths=''):
@@ -997,7 +997,7 @@ def autorun_local_sf(data_name):
997997
sf_sync_dir(path1, path2, single_sync, language_number=language_num(mf_file.get('General', 'language')),
998998
pass_folder_paths=lockfolder, pass_file_paths=lockfile)
999999
logging.info(
1000-
f'Automatically ran Syncfile operation as config "{data_name}"')
1000+
f'\nAutomatically ran Syncfile operation as config "{data_name}"')
10011001

10021002
if place == 'movable':
10031003
autorun_movable_sf(saving_datas)
@@ -1811,7 +1811,7 @@ def sure_save():
18111811
if cf_or_sf.get() == 'cf':
18121812
log_function = 'Cleanfile'
18131813
logging.info(
1814-
f"A config file of {log_function} named {name_entry.get()} is saved")
1814+
f"\nA config file of {log_function} named {name_entry.get()} is saved")
18151815
current_save_name.set(
18161816
r_label_text_dic['current_save_name'][lang_num] + name_entry.get())
18171817
exit_asn()
@@ -1971,14 +1971,14 @@ def del_saving():
19711971
ini_file.write(
19721972
open(cf_config_path, 'w+', encoding='ANSI'))
19731973
logging.info(
1974-
f"A config file of Cleanfile named {del_name} is deleted")
1974+
f"\nA config file of Cleanfile named {del_name} is deleted")
19751975
elif del_mode in ['同步文件(Syncfile)', 'Syncfile'] and is_continue:
19761976
ini_file.read(sf_config_path)
19771977
ini_file.remove_section(del_name)
19781978
ini_file.write(
19791979
open(sf_config_path, 'w+', encoding='ANSI'))
19801980
logging.info(
1981-
f"A config file of Syncfile named {del_name} is deleted")
1981+
f"\nA config file of Syncfile named {del_name} is deleted")
19821982
exit_asr()
19831983

19841984
def sure_open():
@@ -2121,7 +2121,7 @@ def exit_program():
21212121

21222122
root.quit()
21232123
root.destroy()
2124-
logging.info("Movefile Quit \n")
2124+
logging.info("\nMovefile Quit\n")
21252125
ask_permit.join()
21262126
butt_icon.join()
21272127
background_detect.join()
@@ -2266,7 +2266,7 @@ def main():
22662266
boot_visit = initial_data.startup_visit
22672267
first_visit = initial_data.first_visit
22682268
logging.info(
2269-
f"\n{sys.argv}\nMovefile Start\nVisits today: {visits_today}\nTime since startup: {boot_visit}\nStartup visit: {str(boot_visit)}")
2269+
f"\nMovefile Start\nVisits today: {visits_today}\nStartup visit: {str(boot_visit)}")
22702270

22712271
if visits_today == 1 and boot_visit:
22722272
autorun_options = Thread(
0 Bytes
Binary file not shown.

Movefile Code/win10toast -edited/__main__.py

Lines changed: 0 additions & 22 deletions
This file was deleted.
-583 Bytes
Binary file not shown.
-163 KB
Binary file not shown.
File renamed without changes.

README.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ The .exe files provided here only support 64-bit Windows operating system, and W
2424

2525
If your operating system is 32-bit Windows, you can download the code file, and then package it as the .exe file of the 32-bit operating system
2626

27-
***This software only supports Windows operating system***
27+
PS: Starting from version 2.3.4, software installation packages will be provided instead of packaged single file programs
28+
29+
***This software only supports Windows operating system now***
2830

2931
#### pyinstaller packaging method
3032

@@ -34,6 +36,8 @@ If you want to package it as 32-bit exe, you should package it in 32-bit Python.
3436

3537
After installation, open the **Movefile Code** folder, enter **cmd** in the path box of the folder, and then enter ```pyinstaller - i Movefile.ico - noupx Movefile.py -- onefile -w``` in the pop-up command prompt window ,then get the packed file in the output **dist** folder.
3638

39+
***Note: The Win10toast module used in this program has been modified. The modified version adds thread pool and notification queue management functions to improve notification display logic***
40+
3741
### Precautions before use
3842

3943
1.Please do not change the name of this exe file:"Movefile vX.X.X.exe",
@@ -173,6 +177,8 @@ Beta 版程序不会打包,如果想要有更加好的使用体验,请下载
173177

174178
如果操作系统是32位Windows,可以下载pyw文件,然后自行打包为32位操作系统的exe文件
175179

180+
PS: 从2.3.4版本开始将提供软件安装包,而非打包好的单文件程序
181+
176182
***本软件目前仅支持Windows操作系统下使用***
177183

178184
#### pyinstaller打包法
@@ -183,6 +189,8 @@ Beta 版程序不会打包,如果想要有更加好的使用体验,请下载
183189

184190
安装完成后,打开 **Movefile Code** 文件夹,文件夹的索引框内输入 **cmd** ,然后在弹出的命令提示框内输入`pyinstaller -i Movefile.ico -noupx Movefile.py --onefile -w`,就可以在产出的 **dist** 文件夹内得到打包好的exe文件。
185191

192+
***注意:本程序使用的 win10toast 模块是被魔改过的,更改后的版本添加线程池与通知队列管理功能,改进通知显示逻辑***
193+
186194
### 使用前特别注意事项
187195

188196
*1.本exe文件的名称请不要改变:"Movefile vX.X.X.exe",否则会影响开机自启功能
@@ -413,4 +421,12 @@ Movefile v2.3.3
413421
彻底修复开机自启无法自动运行的Bug,
414422
添加logging功能,
415423
使所有执行的操作被记录在Roaming/Movefile/Movefile.log中
424+
425+
21:18 2023/11/30
426+
Movefile v2.3.4
427+
更新内容:
428+
更改开机自启的判断逻辑,使判定更加准确
429+
修复Syncfile功能磁盘同步的路径问题
430+
将开始菜单快捷方式添加功能改为添加桌面快捷方式
431+
修复其他一些小bug,完善logging与import
416432
```

0 commit comments

Comments
 (0)