diff --git a/librespot/audio/decoders.py b/librespot/audio/decoders.py index 7d309a9..155d1fc 100644 --- a/librespot/audio/decoders.py +++ b/librespot/audio/decoders.py @@ -15,19 +15,25 @@ class AudioQuality(enum.Enum): @staticmethod def get_quality(audio_format: AudioFile.Format) -> AudioQuality: - if (audio_format == AudioFile.MP3_96 - or audio_format == AudioFile.OGG_VORBIS_96 - or audio_format == AudioFile.AAC_24_NORM): + if audio_format in [ + AudioFile.MP3_96, + AudioFile.OGG_VORBIS_96, + audio_format == AudioFile.AAC_24_NORMAL, + ]: return AudioQuality.NORMAL - if (audio_format == AudioFile.MP3_160 - or audio_format == AudioFile.MP3_160_ENC - or audio_format == AudioFile.OGG_VORBIS_160 - or audio_format == AudioFile.AAC_24): + if audio_format in [ + AudioFile.MP3_160, + AudioFile.MP3_160_ENC, + AudioFile.OGG_VORBIS_160, + AudioFile.AAC_24, + ]: return AudioQuality.HIGH - if (audio_format == AudioFile.MP3_320 - or audio_format == AudioFile.MP3_256 - or audio_format == AudioFile.OGG_VORBIS_320 - or audio_format == AudioFile.AAC_48): + if audio_format in [ + AudioFile.MP3_320, + AudioFile.MP3_256, + AudioFile.OGG_VORBIS_320, + AudioFile.AAC_48, + ]: return AudioQuality.VERY_HIGH raise RuntimeError("Unknown format: {}".format(format)) diff --git a/librespot/audio/format.py b/librespot/audio/format.py index 5ea945d..4001dd2 100644 --- a/librespot/audio/format.py +++ b/librespot/audio/format.py @@ -9,18 +9,24 @@ class SuperAudioFormat(enum.Enum): @staticmethod def get(audio_format: Metadata.AudioFile.Format): - if audio_format == Metadata.AudioFile.Format.OGG_VORBIS_96 or \ - audio_format == Metadata.AudioFile.Format.OGG_VORBIS_160 or \ - audio_format == Metadata.AudioFile.Format.OGG_VORBIS_320: + if audio_format in [ + Metadata.AudioFile.Format.OGG_VORBIS_96, + Metadata.AudioFile.Format.OGG_VORBIS_160, + Metadata.AudioFile.Format.OGG_VORBIS_320, + ]: return SuperAudioFormat.VORBIS - if audio_format == Metadata.AudioFile.Format.MP3_256 or \ - audio_format == Metadata.AudioFile.Format.MP3_320 or \ - audio_format == Metadata.AudioFile.Format.MP3_160 or \ - audio_format == Metadata.AudioFile.Format.MP3_96 or \ - audio_format == Metadata.AudioFile.Format.MP3_160_ENC: + if audio_format in [ + Metadata.AudioFile.Format.MP3_256, + Metadata.AudioFile.Format.MP3_320, + Metadata.AudioFile.Format.MP3_160, + Metadata.AudioFile.Format.MP3_96, + Metadata.AudioFile.Format.MP3_160_ENC, + ]: return SuperAudioFormat.MP3 - if audio_format == Metadata.AudioFile.Format.AAC_24 or \ - audio_format == Metadata.AudioFile.Format.AAC_48 or \ - audio_format == Metadata.AudioFile.Format.AAC_24_NORM: + if audio_format in [ + Metadata.AudioFile.Format.AAC_24, + Metadata.AudioFile.Format.AAC_48, + Metadata.AudioFile.Format.AAC_24_NORM, + ]: return SuperAudioFormat.AAC raise RuntimeError("Unknown audio format: {}".format(audio_format))