Skip to content

Commit

Permalink
[package] [mediacenter-osmc] Revert webDAV exclusions patch
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Nazarko <email@samnazarko.co.uk>
  • Loading branch information
samnazarko committed Nov 17, 2017
1 parent 855390d commit 4017be0
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package/mediacenter-osmc/files/DEBIAN/control
@@ -1,5 +1,5 @@
Origin: OSMC
Version: 17.6.0-1
Version: 17.6.0-2
Section: video
Essential: No
Priority: required
Expand Down
@@ -0,0 +1,37 @@
From 553905a67844021240e9ab02fd38fbfed0d87e4a Mon Sep 17 00:00:00 2001
From: Sam Nazarko <email@samnazarko.co.uk>
Date: Fri, 17 Nov 2017 02:49:01 +0000
Subject: [PATCH] WebDAV: revert patch which causes performance regressions

Signed-off-by: Sam Nazarko <email@samnazarko.co.uk>
---
xbmc/video/VideoInfoScanner.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp
index fb0f2a3..eccedf4 100644
--- a/xbmc/video/VideoInfoScanner.cpp
+++ b/xbmc/video/VideoInfoScanner.cpp
@@ -429,8 +429,8 @@ namespace VIDEO
continue;

// Discard all exclude files defined by regExExclude
- if (IsExcluded(pItem->GetPath(), (content == CONTENT_TVSHOWS) ? g_advancedSettings.m_tvshowExcludeFromScanRegExps
- : g_advancedSettings.m_moviesExcludeFromScanRegExps))
+ if (CUtil::ExcludeFileOrFolder(pItem->GetPath(), (content == CONTENT_TVSHOWS) ? g_advancedSettings.m_tvshowExcludeFromScanRegExps
+ : g_advancedSettings.m_moviesExcludeFromScanRegExps))
continue;

if (info2->Content() == CONTENT_MOVIES || info2->Content() == CONTENT_MUSICVIDEOS)
@@ -881,7 +881,7 @@ namespace VIDEO
continue;

// Discard all exclude files defined by regExExcludes
- if (IsExcluded(items[i]->GetPath(), regexps))
+ if (CUtil::ExcludeFileOrFolder(items[i]->GetPath(), regexps))
continue;

/*
--
2.7.4

0 comments on commit 4017be0

Please sign in to comment.