tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-22 22:14:44 -04:00
Code Issues Projects Releases Wiki Activity

Added: Monkey Audio and WavPack support (#455)

Browse Source 
* Added: Monkey Audio and WavPack support

* fixup! Add test case, fix typo
This commit is contained in:
Qstick
2018-08-26 21:11:07 -04:00
committed by GitHub
parent 894385747e
commit 499af45566
6 changed files with 190 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Parser/QualityParser.cs
+19 -5
View File
@@ -54,7 +54,7 @@ namespace NzbDrone.Core.Parser
private static readonly Regex SampleSizeRegex = new Regex(@"\b(?:(?<S24>24[ ]bit|24bit|[\[\(].*24bit.*[\]\)]))");
private static readonly Regex CodecRegex = new Regex(@"\b(?:(?<MP3VBR>MP3.*VBR|MPEG Version 1 Audio, Layer 3 vbr)|(?<MP3CBR>MP3|MPEG Version \d+ Audio, Layer 3)|(?<FLAC>flac)|(?<ALAC>alac)|(?<WMA>WMA\d?)|(?<WAV>WAV|PCM)|(?<AAC>M4A|AAC|mp4a)|(?<OGG>OGG|Vorbis))\b",
private static readonly Regex CodecRegex = new Regex(@"\b(?:(?<MP3VBR>MP3.*VBR|MPEG Version 1 Audio, Layer 3 vbr)|(?<MP3CBR>MP3|MPEG Version \d+ Audio, Layer 3)|(?<FLAC>flac)|(?<WAVPACK>wavpack|wv)|(?<ALAC>alac)|(?<WMA>WMA\d?)|(?<WAV>WAV|PCM)|(?<AAC>M4A|AAC|mp4a)|(?<OGG>OGG|Vorbis))\b|(?<APE>monkey's audio|[\[|\(].*ape.*[\]|\)])",
RegexOptions.Compiled | RegexOptions.IgnoreCase);
public static QualityModel ParseQuality(string name, string desc, int fileBitrate, int fileSampleSize = 0)
@@ -66,14 +66,14 @@ namespace NzbDrone.Core.Parser
if (desc.IsNotNullOrWhiteSpace())
{
var descCodec = ParseCodec(desc);
var descCodec = ParseCodec(desc, "");
result.Quality = FindQuality(descCodec, fileBitrate, fileSampleSize);
if (result.Quality != Quality.Unknown) { return result; }
}
var codec = ParseCodec(normalizedName);
var codec = ParseCodec(normalizedName,name);
var bitrate = ParseBitRate(normalizedName);
var sampleSize = ParseSampleSize(normalizedName);
@@ -100,6 +100,12 @@ namespace NzbDrone.Core.Parser
case Codec.ALAC:
result.Quality = Quality.ALAC;
break;
case Codec.WAVPACK:
result.Quality = Quality.WAVPACK;
break;
case Codec.APE:
result.Quality = Quality.APE;
break;
case Codec.WMA:
result.Quality = Quality.WMA;
break;
@@ -154,7 +160,7 @@ namespace NzbDrone.Core.Parser
return result;
}
private static Codec ParseCodec(string name)
private static Codec ParseCodec(string name, string origName)
{
var match = CodecRegex.Match(name);
@@ -167,6 +173,8 @@ namespace NzbDrone.Core.Parser
if (match.Groups["OGG"].Success) { return Codec.OGG; }
if (match.Groups["MP3VBR"].Success) { return Codec.MP3VBR; }
if (match.Groups["MP3CBR"].Success) { return Codec.MP3CBR; }
if (match.Groups["WAVPACK"].Success) { return Codec.WAVPACK; }
if (match.Groups["APE"].Success) { return Codec.APE; }
return Codec.Unknown;
}
@@ -232,6 +240,10 @@ namespace NzbDrone.Core.Parser
return Quality.FLAC;
case Codec.ALAC:
return Quality.ALAC;
case Codec.WAVPACK:
return Quality.WAVPACK;
case Codec.APE:
return Quality.APE;
case Codec.WMA:
return Quality.WMA;
case Codec.WAV:
@@ -289,12 +301,14 @@ namespace NzbDrone.Core.Parser
MP3VBR,
FLAC,
ALAC,
APE,
WAVPACK,
WMA,
AAC,
AACVBR,
OGG,
WAV,
Unknown,
Unknown
}
public enum BitRate