From 6b0aae85ee60bcb07fa58dad6efcee37b4588c66 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 29 May 2011 20:56:49 -0700 Subject: [PATCH 1/3] GetMediaFile should be alot easier on disk. --- NzbDrone.Core/Providers/MediaFileProvider.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index 9405ba8b5..8f0532435 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -12,7 +12,7 @@ namespace NzbDrone.Core.Providers public class MediaFileProvider { private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - private static readonly string[] MediaExtentions = new[] { "*.mkv", "*.avi", "*.wmv", "*.mp4" }; + private static readonly string[] MediaExtentions = new[] { ".mkv", ".avi", ".wmv", ".mp4" }; private readonly DiskProvider _diskProvider; private readonly EpisodeProvider _episodeProvider; private readonly SeriesProvider _seriesProvider; @@ -72,7 +72,7 @@ namespace NzbDrone.Core.Providers if (!_repository.Exists(e => e.Path == Parser.NormalizePath(filePath))) { var parseResult = Parser.ParseEpisodeInfo(filePath); - + if (parseResult == null) return null; @@ -199,14 +199,11 @@ namespace NzbDrone.Core.Providers { Logger.Debug("Scanning '{0}' for episodes", path); - var mediaFileList = new List(); + var filesOnDisk = _diskProvider.GetFiles(path, "*.*", SearchOption.AllDirectories); - foreach (var ext in MediaExtentions) - { - mediaFileList.AddRange(_diskProvider.GetFiles(path, ext, SearchOption.AllDirectories)); - } + var mediaFileList = filesOnDisk.Where(c => MediaExtentions.Contains(Path.GetExtension(c).ToLower())).ToList(); - Logger.Trace("{0} media files were found in {1}", mediaFileList.Count, path); + Logger.Debug("{0} media files were found in {1}", mediaFileList.Count, path); return mediaFileList; } } From 4d11de7d7095b0abb1c9b3edbba05cb2d1410845 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 29 May 2011 21:29:17 -0700 Subject: [PATCH 2/3] updated delete icon --- NzbDrone.Web/Content/Images/X.png | Bin 549 -> 3992 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/NzbDrone.Web/Content/Images/X.png b/NzbDrone.Web/Content/Images/X.png index c0fa6abc1afde2dee6776079b6eb275f67ecac0f..a14b95c41c49e0f610989566048c66334102cb4e 100644 GIT binary patch delta 3969 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 i*7`4fvzLL9jUisenVJ3nL@{6tGI+ZBxvX Date: Sun, 29 May 2011 21:37:48 -0700 Subject: [PATCH 3/3] more icons --- NzbDrone.Web/Content/Images/Plus.png | Bin 473 -> 589 bytes NzbDrone.Web/Content/Images/X.png | Bin 3992 -> 1716 bytes NzbDrone.Web/Content/Images/icon_source.url | 2 ++ 3 files changed, 2 insertions(+) create mode 100644 NzbDrone.Web/Content/Images/icon_source.url diff --git a/NzbDrone.Web/Content/Images/Plus.png b/NzbDrone.Web/Content/Images/Plus.png index 08485e98f91d82799650d44f1b0f2106f73f187d..dbb1e9449a154b599f99a44a0361a9a9d5a81190 100644 GIT binary patch literal 589 zcmV-T0d~8?l-`8)=&fJi-9vK_4@FOk=R)z~mna265HW2HZIfo#-Izk76|&ou>}UptNg&&u zmp8LJvngSW0cOboazPKkn7`R;eBC}k0wY7Q*Jz|5ip zfS&6JPr|nkt}Ds`U#up6ItiHw01=}ywCV?duO+H`S8Gz;F bQ-A>gj7vUFY6VE800000NkvXXu0mjffzJi! literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh#=yXs;VvL>4nJ9*Y2BMl6Z))r3MTPuM!v-tY$DUi04m= zKk5cF*Wc5{F{I*F(x3nT?U^|kSOl2A*Sr%`NMqzsaGSy5z_9Uy&V!lEOM)4gIs`S& zFtC<7+~E;$C{Q(E5OC07Vqj#s#JbklG})}ga4pUb7BL-p#o_m1`dT8mlGJ4OycjbZ?*s$ z)uIx}vee$WHx(!&wj!(Ku0nydLW6_VbH!R)Cu^*05trFs6v>d(Hr@o8UGj_`8)jK?s(7qv3$j!+y(}w%n;Y&qctmf6*h2o z9NzeoRiR9i-5j1Kk<>Vfq|Jp{FR&K;RU-KfYHF<>FVdQ&MBb@ E04Tqd3jhEB diff --git a/NzbDrone.Web/Content/Images/X.png b/NzbDrone.Web/Content/Images/X.png index a14b95c41c49e0f610989566048c66334102cb4e..445702cc8560ed0f7b7f43929eabc810695daa4e 100644 GIT binary patch literal 1716 zcmV;l221&gP)^(6`iC0HR?UO%r zDk0hJMiKaBz<;*;@E}EE9&xXtSu}lWj>>s`;_0LDlZI*8&iP-yoD=YgBXRO7wNflC z8zP>zV!nmy^wEY1)Zup>j8QbEQmLquZleAM7*#BZroW!2azUTi`_fQH2@Ze$tNEm_ zAMh^@kyo;4sbq)}=?^GWS}|$*^t^3}jsgw%1AvbzR0MoQw;C{EKO}HH{Y^$lB#sQW zl;F=#pIWHFAC8e1_j1Vf`tvH2XrM0f?Sd_dwgP}Z2KcF6`y&*Ms8lH3hF=R6sY{$$ z6cT%0h^>?0&;5EjQ-ePg74X?L@b$zcLUoBV8PY24C0YtJ;GYd6=T*u#fnN(3txKGR zMA4Xd>QJ;H!GHhl%wp0PWU0h~8vJ4t__Y$eWJ^^`#A_$fRG^1OV@mWU4&5 zCrCrX9#PB{!)EWYDxq8E zU-Q_lLSw2|PH%qPN2glSVwIc%<~^ zoqeRZl#r#`dnUf&4&I`_|6CzmYYuOx8x<0pwtHPkbdylu>Bi+sTX?$z*_fhA>Cs12 z!ug)S>m2^7))C&xR65xI@*ig8Q$q+ZcI@q9p3^8rFZbNe_?>r$rijL zfw}~P#PB9YOxb97qPZK+;2jIBl^7b9HcSH0G=B>{mEjEDl|Vy+Q92e!cgebk&tPnI z1MhlGj1*J=9>Uwp7-0>UTT6Vb2r4q=WFZiA6T?jvN(H=>d}36h0*3h2T`3a=T%xUI!kn#%%yzHOl}WUdk%l6gd}>WD@8A@nC&InO{Y^n*-UQh ztDwQI!r#LU+c0Lo0VdP66)qvSlxVe}N%aAKt6J^~-df%GlU%$lBv2B(i@jd;QN?O5 z(QHk;laYDRuNTRSC}qPXJYQI|fVlP=C49)8gddF>>l!MuAUNb5khs!mB%U#lXBCr? zrfaUM0Ee%70{lEKwjfy`?WqBq2 zm=fTF0^U=~PV$3a^LzX^r|~!g&kUraV5>UX*g{@TDdhr5HcP^iWiosrejZl~naMkr zi2boK$u!ffyhJ$Li>Iih`}#TNaln7!YHN`!Yl!%E-m2yX-iK-e1I?m#9aDPgG|GJ^vC z6~KSK5mN~vAr(;k)w?8Q^jV=WUl@$b3v-ips)jijhlG)qbG#&sySC%dV0mWPfOk5X zt4S>3qjd?aW~^{Tz)N$pla6|-`0yAO0ck0h6^nryya(|F{0YE+(u?V|kRYCOIzAe$ z!P6~g@V7THYZA1W@UI3B1iDQB3NQeeJTTd6kvwAn0000< KMNUMnLSTZ=_%X=< literal 3992 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