|
4 | 4 | import save as sv |
5 | 5 | import tray_icon as ti |
6 | 6 | import time as time |
| 7 | +import json |
| 8 | +def load_variables_from_json(): |
| 9 | + dirname = os.path.dirname(__file__) |
| 10 | + filename = os.path.join(dirname, 'config.json') |
| 11 | + try: |
| 12 | + with open(filename, "r") as json_file: |
| 13 | + loaded_vars = json.load(json_file) |
| 14 | + except FileNotFoundError: |
| 15 | + # If the config file doesn't exist, return an empty dictionary |
| 16 | + return {} |
| 17 | + return loaded_vars |
7 | 18 | def move_file(main_directory, move_folder, filename): |
| 19 | + if move_folder is None: |
| 20 | + raise ValueError("Invalid move_folder: None") |
| 21 | + |
8 | 22 | if not os.path.exists(move_folder): |
9 | 23 | os.makedirs(move_folder) |
| 24 | + |
10 | 25 | shutil.move(os.path.join(main_directory, filename), os.path.join(move_folder, filename)) |
11 | 26 | def check_file_extension(file_ext, mov_dir, filename): |
12 | 27 | if filename.endswith(file_ext): |
13 | 28 | time.sleep(1) |
14 | 29 | move_file(main_directory=sv.get_default_download_folder(), move_folder=mov_dir, filename=filename) |
15 | 30 | def main_stuff(): |
16 | | - loaded_vars = sv.load_variables_from_json() |
| 31 | + sv.main() |
| 32 | + loaded_vars = load_variables_from_json() |
17 | 33 | print(loaded_vars) |
18 | 34 | print(sv.get_default_download_folder()) |
19 | | - print(loaded_vars['DOCX']) |
20 | 35 | print('Program started.') |
21 | 36 | while var.run: |
22 | 37 | for filename in os.listdir(sv.get_default_download_folder()): |
23 | 38 | try: |
24 | | - check_file_extension(".pdf", mov_dir=loaded_vars[var.PDF], filename=filename) |
25 | | - check_file_extension(".docx", mov_dir=loaded_vars[var.DOCX], filename=filename) |
26 | | - check_file_extension('.zip', mov_dir=loaded_vars[var.ZIP], filename=filename) |
27 | | - check_file_extension(var.Image, mov_dir=loaded_vars[var.IMAGE], filename=filename) |
28 | | - check_file_extension('.py', mov_dir=loaded_vars[var.Python], filename=filename) |
29 | | - check_file_extension(var.Video, mov_dir=loaded_vars[var.VIDEO], filename=filename) |
30 | | - check_file_extension(var.audio_formats, mov_dir=loaded_vars[var.MUSIC], filename=filename) |
31 | | - check_file_extension('.torrent', mov_dir=loaded_vars[var.Torrent], filename=filename) |
| 39 | + check_file_extension(".pdf", mov_dir=loaded_vars.get(var.PDF), filename=filename) |
| 40 | + check_file_extension(".docx", mov_dir=loaded_vars.get(var.DOCX), filename=filename) |
| 41 | + check_file_extension('.zip', mov_dir=loaded_vars.get(var.ZIP), filename=filename) |
| 42 | + check_file_extension(var.Image, mov_dir=loaded_vars.get(var.IMAGE), filename=filename) |
| 43 | + check_file_extension('.py', mov_dir=loaded_vars.get(var.Python), filename=filename) |
| 44 | + check_file_extension(var.Video, mov_dir=loaded_vars.get(var.VIDEO), filename=filename) |
| 45 | + check_file_extension(var.audio_formats,mov_dir=loaded_vars.get(var.MUSIC), filename=filename) |
| 46 | + check_file_extension('.torrent', mov_dir=loaded_vars.get(var.Torrent), filename=filename) |
32 | 47 | except PermissionError: |
33 | 48 | continue |
34 | 49 | if __name__ == "__main__": |
35 | | - sv.main() |
| 50 | + |
36 | 51 | ti.start() |
37 | 52 | main_stuff() |
0 commit comments