|
8 | 8 |
|
9 | 9 |
|
10 | 10 | """This function checks if the filename is valid and doesn't contain any dot character in the name.""" |
11 | | -def is_valid_name(filename): |
| 11 | +def is_valid_name(filename: str) -> bool: |
12 | 12 | name = filename.rsplit('.', 1)[0] |
13 | 13 | regex_match = re.search(FILENAME_REGEX_PATTERN, name) |
14 | 14 | return True if(regex_match != None) else False |
15 | 15 |
|
16 | 16 | """This function checks for the valid file extensions.""" |
17 | | -def is_valid_extension(filename): |
| 17 | +def is_valid_extension(filename: str) -> bool: |
18 | 18 | ext = filename.rsplit(".", 1)[1] |
19 | 19 | return True if (ext in ALLOWED_EXTENSIONS) else False |
20 | 20 |
|
21 | | -def valid_filename(filename): |
| 21 | +def valid_filename(filename: str) -> str: |
22 | 22 | name, ext = filename.rsplit('.', 1) |
23 | 23 | name = re.sub(r"\.", "", name) |
24 | 24 | name = re.sub(r"\%[A-Za-z0-9]+", "", name) |
25 | 25 | ext = re.sub(r"\%[A-Za-z0-9]+", "", ext) |
26 | 26 | regex_match = re.search(FILENAME_REGEX_PATTERN, name) |
27 | 27 | return f"{regex_match.group(0)}.{ext}" # returns the sanitized filename with the extension for upload |
28 | 28 |
|
29 | | -def get_unique_filename(directory, filename): |
| 29 | +def get_unique_filename(directory: str, filename:str) -> str: |
30 | 30 | name, ext = filename.rsplit(".", 1) |
31 | | - # name = valid_filename(name) |
32 | | - |
33 | 31 | unique_filename = f"{name}.{ext}" |
34 | 32 | count = 1 |
35 | 33 |
|
|
0 commit comments