Merge branch 'pr/azumukupoe/158'

Author: Googolplexed0

README.md

@@ -49,7 +49,7 @@ If an artist's URL is given, all albums by the specified artist will be download
 | `-c`, `--config-location`     | Specify a directory containing a Zotify `config.json` file to load settings            |
 | `-u`, `--username`            | Account username                                                                       |
 | `--password`                  | Account password                                                                       |
-| `--token`                     | Authentication token                                                                    |
+| `--token`                     | Authentication token                                                                   |
 
 | Command Line Flag (exclusive) | Function                                                                               |
 |-------------------------------|----------------------------------------------------------------------------------------|
@@ -85,6 +85,7 @@ Set arguments in the commandline like this: `-sc False` or `--codec mp3`. Wrap a
 | `ALBUM_ART_JPG_FILE`         | `--album-art-jpg-file`                   | False     | Save album art as a separate .jpg file                                                    |
 | `SONG_ARCHIVE_LOCATION`      | `--song-archive-location`                |           | Directory where Zotify saves the global song_archive file                                 |
 | `DISABLE_DIRECTORY_ARCHIVES` | `--disable-directory-archives`           | False     | Disable local song_archive in download directories                                        |
+| `MAX_FILENAME_LENGTH`        | `--max-filename-length`                  | 0         | Maximum character length of filenames, truncated to fit, 0 meaning no limit               |
 | `SPLIT_ALBUM_DISCS`          | `--split-album-discs`                    | False     | Saves each disk in its own folder                                                         |
 | `DOWNLOAD_LYRICS`            | `--download-lyrics`                      | True      | Downloads synced lyrics in .lrc format, uses unsynced as fallback                         |
 | `LYRICS_LOCATION`            | `--lyrics-location`                      |           | Directory where Zotify saves lyrics files (default is output directory)                   |

zotify/config.py

@@ -52,7 +52,7 @@
 EXPORT_M3U8 = 'EXPORT_M3U8'
 LIKED_SONGS_ARCHIVE_M3U8 = 'LIKED_SONGS_ARCHIVE_M3U8'
 ALBUM_ART_JPG_FILE = 'ALBUM_ART_JPG_FILE'
-
+MAX_FILENAME_LENGTH = 'MAX_FILENAME_LENGTH'
 
 CONFIG_VALUES = {
     ROOT_PATH:                  { 'default': '~/Music/Zotify Music',    'type': str,    'arg': ('-rp', '--root-path'                     ,) },
@@ -77,6 +77,7 @@
     EXPORT_M3U8:                { 'default': 'False',                   'type': bool,   'arg': ('-e, --export-m3u8'                      ,) },
     LIKED_SONGS_ARCHIVE_M3U8:   { 'default': 'True',                    'type': bool,   'arg': ('--liked-songs-archive-m3u8'             ,) },
     ROOT_PODCAST_PATH:          { 'default': '~/Music/Zotify Podcasts', 'type': str,    'arg': ('-rpp', '--root-podcast-path'            ,) },
+    MAX_FILENAME_LENGTH:        { 'default': '0',                       'type': int,    'arg': ('--max-filename-length'                  ,) },
     TEMP_DOWNLOAD_DIR:          { 'default': '',                        'type': str,    'arg': ('-td', '--temp-download-dir'             ,) },
     DOWNLOAD_FORMAT:            { 'default': 'copy',                    'type': str,    'arg': ('--codec', '--download-format'           ,) },
     DOWNLOAD_QUALITY:           { 'default': 'auto',                    'type': str,    'arg': ('-q', '--download-quality'               ,) },
@@ -409,4 +410,8 @@ def get_liked_songs_archive_m3u8(cls) -> bool:
 
     @classmethod
     def get_album_art_jpg_file(cls) -> bool:
-        return cls.get(ALBUM_ART_JPG_FILE)
+        return cls.get(ALBUM_ART_JPG_FILE)
+    
+    @classmethod
+    def get_max_filename_length(cls) -> int:
+        return cls.get(MAX_FILENAME_LENGTH)

zotify/utils.py

@@ -328,7 +328,13 @@ def fix_filename(name):
     >>> all('_' == fix_filename(chr(i)) for i in list(range(32)))
     True
     """
-    return re.sub(r'[/\\:|<>"?*\0-\x1f]|^(AUX|COM[1-9]|CON|LPT[1-9]|NUL|PRN)(?![^.])|^\s|[\s.]$', "_", str(name), flags=re.IGNORECASE)
+    name = re.sub(r'[/\\:|<>"?*\0-\x1f]|^(AUX|COM[1-9]|CON|LPT[1-9]|NUL|PRN)(?![^.])|^\s|[\s.]$', "_", str(name), flags=re.IGNORECASE)
+    
+    maxlen = Zotify.CONFIG.get_max_filename_length()
+    if maxlen and len(name) > maxlen:
+        name = name[:maxlen]
+    
+    return name
 
 
 def fmt_seconds(secs: float) -> str: