Adding upstream version 2:20.4+dfsg.upstream/2%20.4+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 30 insertions, 0 deletions

diff --git a/xbmc/InfoScanner.cpp b/xbmc/InfoScanner.cpp
new file mode 100644
index 0000000..4db687b
--- /dev/null
+++ b/xbmc/InfoScanner.cpp
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (C) 2016-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "InfoScanner.h"
+
+#include "URL.h"
+#include "utils/FileUtils.h"
+#include "utils/URIUtils.h"
+#include "utils/log.h"
+
+bool CInfoScanner::HasNoMedia(const std::string &strDirectory) const
+{
+  std::string noMediaFile = URIUtils::AddFileToFolder(strDirectory, ".nomedia");
+
+  if (!URIUtils::IsPlugin(strDirectory) && CFileUtils::Exists(noMediaFile))
+  {
+    CLog::Log(LOGWARNING,
+              "Skipping item '{}' with '.nomedia' file in parent directory, it won't be added to "
+              "the library.",
+              CURL::GetRedacted(strDirectory));
+    return true;
+  }
+
+  return false;
+}