mirror of
https://github.com/Readarr/Readarr.git
synced 2026-04-21 22:04:31 -04:00
Extend Qualities and Setup Default Groups (#127)
* Extend Qualities and Setup Default Groups * fixup! Extend Qualities * fixup! Codacy * fixup! One more
This commit is contained in:
Qstick
GitHub
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices.WindowsRuntime;
|
||||
using System.Text.RegularExpressions;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
@@ -39,76 +40,98 @@ namespace NzbDrone.Core.Parser
|
||||
private static readonly Regex RealRegex = new Regex(@"\b(?<real>REAL)\b",
|
||||
RegexOptions.Compiled);
|
||||
|
||||
private static readonly Regex BitRateRegex = new Regex(@"\b(?:(?<B192>192[ ]?kbps|192|[\[\(].*192.*[\]\)])|
|
||||
(?<B256>256[ ]?kbps|256|[\[\(].*256.*[\]\)])|
|
||||
(?<B320>320[ ]?kbps|320|[\[\(].*320.*[\]\)])|
|
||||
(?<B512>512[ ]?kbps|512|[\[\(].*512.*[\]\)])|
|
||||
(?<VBR>VBR[ ]?kbps|VBR|[\[\(].*VBR.*[\]\)])|
|
||||
(?<FLAC>FLAC))\b",
|
||||
private static readonly Regex BitRateRegex = new Regex(@"\b(?:(?<B096>96[ ]?kbps|96|[\[\(].*96.*[\]\)])|
|
||||
(?<B128>128[ ]?kbps|128|[\[\(].*128.*[\]\)])|
|
||||
(?<B160>160[ ]?kbps|160|[\[\(].*160.*[\]\)]|q5)|
|
||||
(?<B192>192[ ]?kbps|192|[\[\(].*192.*[\]\)]|q6)|
|
||||
(?<B224>224[ ]?kbps|224|[\[\(].*224.*[\]\)]|q7)|
|
||||
(?<B256>256[ ]?kbps|256|itunes\splus|[\[\(].*256.*[\]\)]|q8)|
|
||||
(?<B320>320[ ]?kbps|320|[\[\(].*320.*[\]\)]|q9)|
|
||||
(?<B500>500[ ]?kbps|500|[\[\(].*500.*[\]\)]|q10)|
|
||||
(?<VBRV0>V0[ ]?kbps|V0|[\[\(].*V0.*[\]\)])|
|
||||
(?<VBRV2>V2[ ]?kbps|V2|[\[\(].*V2.*[\]\)]))\b",
|
||||
RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
|
||||
|
||||
private static readonly Regex CodecRegex = new Regex(@"\b(?:
|
||||
(?<MP3>MPEG Version \d+ Audio, Layer 3)|
|
||||
(?<FLAC>flac)|
|
||||
(?<VBR>VBR|MPEG Version \d+ Audio, Layer 3 VBR$)
|
||||
)\b",
|
||||
RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
|
||||
private static readonly Regex SampleSizeRegex = new Regex(@"\b(?:(?<S24>24[ ]bit|24bit|[\[\(].*24bit.*[\]\)]))");
|
||||
|
||||
private static readonly Regex CodecRegex = new Regex(@"\b(?:(?<MP3VBR>MP3\S*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",
|
||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
public static QualityModel ParseQuality(string desc, int bitrate, int sampleRate)
|
||||
{
|
||||
var result = new QualityModel { Quality = Quality.Unknown };
|
||||
|
||||
switch (bitrate)
|
||||
{
|
||||
case 192:
|
||||
result.Quality = Quality.MP3_192;
|
||||
break;
|
||||
case 256:
|
||||
result.Quality = Quality.MP3_256;
|
||||
break;
|
||||
case 320:
|
||||
result.Quality = Quality.MP3_320;
|
||||
break;
|
||||
default:
|
||||
var match = CodecRegex.Match(desc); //TODO: BUG: Figure out why this always fails
|
||||
if (!match.Success) result.Quality = Quality.Unknown;
|
||||
if (match.Groups["VBR"].Success) result.Quality = Quality.MP3_VBR;
|
||||
if (match.Groups["FLAC"].Success) result.Quality = Quality.FLAC;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public static QualityModel ParseQuality(string name)
|
||||
public static QualityModel ParseQuality(string name, string desc, int fileBitrate, int fileSampleSize = 0)
|
||||
{
|
||||
Logger.Debug("Trying to parse quality for {0}", name);
|
||||
|
||||
var normalizedName = name.Replace('_', ' ').Trim().ToLower();
|
||||
var result = ParseQualityModifiers(name, normalizedName);
|
||||
var bitrate = ParseBitRate(normalizedName);
|
||||
|
||||
switch(bitrate)
|
||||
if (desc.IsNotNullOrWhiteSpace())
|
||||
{
|
||||
case BitRate.B192:
|
||||
result.Quality = Quality.MP3_192;
|
||||
var descCodec = ParseCodec(desc);
|
||||
|
||||
result.Quality = FindQuality(descCodec, fileBitrate, fileSampleSize);
|
||||
|
||||
if (result.Quality != Quality.Unknown) { return result; }
|
||||
}
|
||||
|
||||
var codec = ParseCodec(normalizedName);
|
||||
var bitrate = ParseBitRate(normalizedName);
|
||||
var sampleSize = ParseSampleSize(normalizedName);
|
||||
|
||||
switch(codec)
|
||||
{
|
||||
case Codec.MP3VBR:
|
||||
if (bitrate == BitRate.VBRV0) { result.Quality = Quality.MP3_VBR; }
|
||||
else if (bitrate == BitRate.VBRV2) { result.Quality = Quality.MP3_VBR_V2; }
|
||||
else { result.Quality = Quality.Unknown; }
|
||||
break;
|
||||
case BitRate.B256:
|
||||
result.Quality = Quality.MP3_256;
|
||||
case Codec.MP3CBR:
|
||||
if (bitrate == BitRate.B096) { result.Quality = Quality.MP3_096; }
|
||||
else if (bitrate == BitRate.B128) { result.Quality = Quality.MP3_128; }
|
||||
else if (bitrate == BitRate.B160) { result.Quality = Quality.MP3_160; }
|
||||
else if (bitrate == BitRate.B192) { result.Quality = Quality.MP3_192; }
|
||||
else if (bitrate == BitRate.B256) { result.Quality = Quality.MP3_256; }
|
||||
else if (bitrate == BitRate.B320) { result.Quality = Quality.MP3_320; }
|
||||
else { result.Quality = Quality.Unknown; }
|
||||
break;
|
||||
case BitRate.B320:
|
||||
result.Quality = Quality.MP3_320;
|
||||
case Codec.FLAC:
|
||||
if (sampleSize == SampleSize.S24) {result.Quality = Quality.FLAC_24;}
|
||||
else {result.Quality = Quality.FLAC;}
|
||||
break;
|
||||
case BitRate.B512:
|
||||
result.Quality = Quality.MP3_512;
|
||||
case Codec.ALAC:
|
||||
result.Quality = Quality.ALAC;
|
||||
break;
|
||||
case BitRate.FLAC:
|
||||
result.Quality = Quality.FLAC;
|
||||
case Codec.WMA:
|
||||
result.Quality = Quality.WMA;
|
||||
break;
|
||||
case BitRate.VBR:
|
||||
result.Quality = Quality.MP3_VBR;
|
||||
case Codec.WAV:
|
||||
result.Quality = Quality.WAV;
|
||||
break;
|
||||
case Codec.AAC:
|
||||
if (bitrate == BitRate.B192) { result.Quality = Quality.AAC_192; }
|
||||
else if (bitrate == BitRate.B256) { result.Quality = Quality.AAC_256; }
|
||||
else if (bitrate == BitRate.B320) { result.Quality = Quality.AAC_320; }
|
||||
else { result.Quality = Quality.AAC_VBR; }
|
||||
break;
|
||||
case Codec.AACVBR:
|
||||
result.Quality = Quality.AAC_VBR;
|
||||
break;
|
||||
case Codec.OGG:
|
||||
if (bitrate == BitRate.B160) { result.Quality = Quality.VORBIS_Q5; }
|
||||
else if (bitrate == BitRate.B192) { result.Quality = Quality.VORBIS_Q6; }
|
||||
else if (bitrate == BitRate.B224) { result.Quality = Quality.VORBIS_Q7; }
|
||||
else if (bitrate == BitRate.B256) { result.Quality = Quality.VORBIS_Q8; }
|
||||
else if (bitrate == BitRate.B320) { result.Quality = Quality.VORBIS_Q9; }
|
||||
else if (bitrate == BitRate.B500) { result.Quality = Quality.VORBIS_Q10; }
|
||||
break;
|
||||
case Codec.Unknown:
|
||||
if (bitrate == BitRate.B192) { result.Quality = Quality.MP3_192; }
|
||||
else if (bitrate == BitRate.B256) { result.Quality = Quality.MP3_256; }
|
||||
else if (bitrate == BitRate.B320) { result.Quality = Quality.MP3_320; }
|
||||
else if (bitrate == BitRate.VBR) { result.Quality = Quality.MP3_VBR_V2; }
|
||||
else { result.Quality = Quality.Unknown; }
|
||||
break;
|
||||
default:
|
||||
result.Quality = Quality.Unknown;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -130,15 +153,21 @@ namespace NzbDrone.Core.Parser
|
||||
return result;
|
||||
}
|
||||
|
||||
private static BitRate ParseCodec(string name)
|
||||
private static Codec ParseCodec(string name)
|
||||
{
|
||||
var match = BitRateRegex.Match(name);
|
||||
var match = CodecRegex.Match(name);
|
||||
|
||||
if (!match.Success) return BitRate.Unknown;
|
||||
if (match.Groups["FLAC"].Success) return BitRate.FLAC;
|
||||
if (match.Groups["VBR"].Success) return BitRate.VBR;
|
||||
if (!match.Success) { return Codec.Unknown; }
|
||||
if (match.Groups["FLAC"].Success) { return Codec.FLAC; }
|
||||
if (match.Groups["ALAC"].Success) { return Codec.ALAC; }
|
||||
if (match.Groups["WMA"].Success) { return Codec.WMA; }
|
||||
if (match.Groups["WAV"].Success) { return Codec.WAV; }
|
||||
if (match.Groups["AAC"].Success) { return Codec.AAC; }
|
||||
if (match.Groups["OGG"].Success) { return Codec.OGG; }
|
||||
if (match.Groups["MP3VBR"].Success) { return Codec.MP3VBR; }
|
||||
if (match.Groups["MP3CBR"].Success) { return Codec.MP3CBR; }
|
||||
|
||||
return BitRate.Unknown;
|
||||
return Codec.Unknown;
|
||||
}
|
||||
|
||||
private static BitRate ParseBitRate(string name)
|
||||
@@ -147,16 +176,83 @@ namespace NzbDrone.Core.Parser
|
||||
var match = BitRateRegex.Match(name);
|
||||
|
||||
if (!match.Success) return BitRate.Unknown;
|
||||
if (match.Groups["B192"].Success) return BitRate.B192;
|
||||
if (match.Groups["B256"].Success) return BitRate.B256;
|
||||
if (match.Groups["B320"].Success) return BitRate.B320;
|
||||
if (match.Groups["B512"].Success) return BitRate.B512;
|
||||
if (match.Groups["FLAC"].Success) return BitRate.FLAC;
|
||||
if (match.Groups["VBR"].Success) return BitRate.VBR;
|
||||
if (match.Groups["B096"].Success) { return BitRate.B096; }
|
||||
if (match.Groups["B128"].Success) { return BitRate.B128; }
|
||||
if (match.Groups["B160"].Success) { return BitRate.B160; }
|
||||
if (match.Groups["B192"].Success) { return BitRate.B192; }
|
||||
if (match.Groups["B224"].Success) { return BitRate.B224; }
|
||||
if (match.Groups["B256"].Success) { return BitRate.B256; }
|
||||
if (match.Groups["B320"].Success) { return BitRate.B320; }
|
||||
if (match.Groups["B500"].Success) { return BitRate.B500; }
|
||||
if (match.Groups["VBR"].Success) { return BitRate.VBR; }
|
||||
if (match.Groups["VBRV0"].Success) { return BitRate.VBRV0; }
|
||||
if (match.Groups["VBRV2"].Success) { return BitRate.VBRV2; }
|
||||
|
||||
return BitRate.Unknown;
|
||||
}
|
||||
|
||||
private static SampleSize ParseSampleSize(string name)
|
||||
{
|
||||
var match = SampleSizeRegex.Match(name);
|
||||
|
||||
if (!match.Success) { return SampleSize.Unknown; }
|
||||
if (match.Groups["S24"].Success) { return SampleSize.S24; }
|
||||
|
||||
return SampleSize.Unknown;
|
||||
}
|
||||
|
||||
private static Quality FindQuality(Codec codec, int bitrate, int sampleSize = 0)
|
||||
{
|
||||
switch (codec)
|
||||
{
|
||||
case Codec.MP3VBR:
|
||||
return Quality.MP3_VBR;
|
||||
case Codec.MP3CBR:
|
||||
if (bitrate == 8) { return Quality.MP3_008; }
|
||||
if (bitrate == 16) { return Quality.MP3_016; }
|
||||
if (bitrate == 24) { return Quality.MP3_024; }
|
||||
if (bitrate == 32) { return Quality.MP3_032; }
|
||||
if (bitrate == 40) { return Quality.MP3_040; }
|
||||
if (bitrate == 48) { return Quality.MP3_048; }
|
||||
if (bitrate == 56) { return Quality.MP3_056; }
|
||||
if (bitrate == 64) { return Quality.MP3_064; }
|
||||
if (bitrate == 80) { return Quality.MP3_080; }
|
||||
if (bitrate == 96) { return Quality.MP3_096; }
|
||||
if (bitrate == 112) { return Quality.MP3_112; }
|
||||
if (bitrate == 128) { return Quality.MP3_128; }
|
||||
if (bitrate == 160) { return Quality.MP3_160; }
|
||||
if (bitrate == 192) { return Quality.MP3_192; }
|
||||
if (bitrate == 224) { return Quality.MP3_224; }
|
||||
if (bitrate == 256) { return Quality.MP3_256; }
|
||||
if (bitrate == 320) { return Quality.MP3_320; }
|
||||
return Quality.Unknown;
|
||||
case Codec.FLAC:
|
||||
if (sampleSize == 24) {return Quality.FLAC_24;}
|
||||
return Quality.FLAC;
|
||||
case Codec.ALAC:
|
||||
return Quality.ALAC;
|
||||
case Codec.WMA:
|
||||
return Quality.WMA;
|
||||
case Codec.WAV:
|
||||
return Quality.WAV;
|
||||
case Codec.AAC:
|
||||
if (bitrate == 192) { return Quality.AAC_192; }
|
||||
if (bitrate == 256) { return Quality.AAC_256; }
|
||||
if (bitrate == 320) { return Quality.AAC_320; }
|
||||
return Quality.AAC_VBR;
|
||||
case Codec.OGG:
|
||||
if (bitrate == 160) { return Quality.VORBIS_Q5; }
|
||||
if (bitrate == 192) { return Quality.VORBIS_Q6; }
|
||||
if (bitrate == 224) { return Quality.VORBIS_Q7; }
|
||||
if (bitrate == 256) { return Quality.VORBIS_Q8; }
|
||||
if (bitrate == 320) { return Quality.VORBIS_Q9; }
|
||||
if (bitrate == 500) { return Quality.VORBIS_Q10; }
|
||||
return Quality.Unknown;
|
||||
default:
|
||||
return Quality.Unknown;
|
||||
}
|
||||
}
|
||||
|
||||
private static QualityModel ParseQualityModifiers(string name, string normalizedName)
|
||||
{
|
||||
var result = new QualityModel { Quality = Quality.Unknown };
|
||||
@@ -166,7 +262,7 @@ namespace NzbDrone.Core.Parser
|
||||
result.Revision.Version = 2;
|
||||
}
|
||||
|
||||
var versionRegexResult = VersionRegex.Match(normalizedName);
|
||||
Match versionRegexResult = VersionRegex.Match(normalizedName);
|
||||
|
||||
if (versionRegexResult.Success)
|
||||
{
|
||||
@@ -175,7 +271,7 @@ namespace NzbDrone.Core.Parser
|
||||
|
||||
//TODO: re-enable this when we have a reliable way to determine real
|
||||
//TODO: Only treat it as a real if it comes AFTER the season/epsiode number
|
||||
var realRegexResult = RealRegex.Matches(name);
|
||||
MatchCollection realRegexResult = RealRegex.Matches(name);
|
||||
|
||||
if (realRegexResult.Count > 0)
|
||||
{
|
||||
@@ -186,14 +282,39 @@ namespace NzbDrone.Core.Parser
|
||||
}
|
||||
}
|
||||
|
||||
public enum BitRate
|
||||
public enum Codec
|
||||
{
|
||||
B192,
|
||||
B256,
|
||||
B320,
|
||||
B512,
|
||||
VBR,
|
||||
MP3CBR,
|
||||
MP3VBR,
|
||||
FLAC,
|
||||
ALAC,
|
||||
WMA,
|
||||
AAC,
|
||||
AACVBR,
|
||||
OGG,
|
||||
WAV,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
public enum BitRate
|
||||
{
|
||||
B096,
|
||||
B128,
|
||||
B160,
|
||||
B192,
|
||||
B224,
|
||||
B256,
|
||||
B320,
|
||||
B500,
|
||||
VBR,
|
||||
VBRV0,
|
||||
VBRV2,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
public enum SampleSize
|
||||
{
|
||||
S24,
|
||||
Unknown
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user