Skip to content

Commit 507c362

Browse files
committed
Movefile v1.4.3 Released
修复了一个较严重的逻辑漏洞
1 parent ab0cf2d commit 507c362

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

.idea/workspace.xml

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Movefile/File_Syncer v1.0.0.pyw renamed to Movefile/File_Syncer v1.0.0 -Beta.pyw

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ def judge_update_time(file_path_1, file_path_2):
3535
return '='
3636

3737

38+
39+
3840
print(scan_folder('C:\\Users\\25674\\Desktop'))
3941
print(judge_update_time("C:\\Users\\25674\\Desktop\\Desktop Files' Home", "C:\\Users\\25674\\Desktop\\Desktop Files' Home"))
4042

Binary file not shown.

Movefile/Movefile v1.4.2.pyw renamed to Movefile/Movefile v1.4.3.pyw

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Created on Wed Dec 21 17:07:30 2022
55
@author: Robert He
66
"""
77

8-
vision = 'v1.4.2'
9-
update_time = '2023/1/12-noon'
8+
vision = 'v1.4.3'
9+
update_time = '2023/1/13-night'
1010

1111
import os
1212
import time
@@ -263,8 +263,8 @@ def data_error():
263263
mode_ = cf.getint('Movefile_settings', 'mode')
264264
move_folder = cf.get('Movefile_settings', 'move_folder')
265265
autorun_ = cf.get('Movefile_settings', 'autorun')
266-
move_dir(old__path=old_path_, new__path=new_path_, passfile=passfile, pass__format=passformat, t=time_,
267-
mode=mode_, is__movefolder=False, test=True)
266+
move_dir(old__path=old_path_, new__path=new_path_, pass__file=passfile, pass__format=passformat, t=time_,
267+
check__mode=mode_, is__movefolder=False, test=True)
268268
if (move_folder == 'True' or move_folder == 'False') and (autorun_ == 'True' or autorun_ == 'False'):
269269
return False
270270
else:
@@ -604,7 +604,7 @@ def askinfo(error=False, muti_ask=False, first_ask=False):
604604
root.mainloop()
605605

606606

607-
def move_dir(old__path, new__path, passfile, pass__format, t, mode, is__movefolder, test=False):
607+
def move_dir(old__path, new__path, pass__file, pass__format, t, check__mode, is__movefolder, test=False):
608608
global Movename, Errorname
609609
Movename = ''
610610
Errorname = ''
@@ -620,11 +620,11 @@ def move_dir(old__path, new__path, passfile, pass__format, t, mode, is__movefold
620620
continue
621621
is_folder = os.path.isdir(file)
622622
now = int(time.time()) # 当前时间
623-
if (not is_folder and ((file not in passfile) or pf)) or (
624-
is_folder and file not in passfile and is__movefolder): # 判断移动条件
625-
if mode == 1:
623+
if (not is_folder and ((file not in pass__file) and not pf)) or (
624+
is_folder and file not in pass__file and is__movefolder): # 判断移动条件
625+
if check__mode == 1:
626626
last = int(os.stat(file_path).st_mtime) # 最后一次修改的时间 (Option 1)
627-
elif mode == 2:
627+
elif check__mode == 2:
628628
last = int(os.stat(file_path).st_atime) # 最后一次访问的时间 (Option 2)
629629
else:
630630
raise
@@ -683,7 +683,7 @@ def operate(filename):
683683
set_startup(True)
684684
else:
685685
set_startup(False)
686-
move_dir(old_path, new_path, passfile, passformat, time_, mode, is_movefolder)
686+
move_dir(old__path=old_path, new__path=new_path, pass__file=passfile, pass__format=passformat, t=time_, check__mode=mode, is__movefolder=is_movefolder)
687687

688688

689689
def show_notice():
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)