From d5b017407de1c465da614efd7a3ab47d61523e78 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 30 Jan 2014 10:11:12 +0100 Subject: ExcludeList: move to db/update/ --- Makefile.am | 2 +- src/ExcludeList.cxx | 83 ------------------------------------------- src/ExcludeList.hxx | 80 ----------------------------------------- src/db/update/ExcludeList.cxx | 83 +++++++++++++++++++++++++++++++++++++++++++ src/db/update/ExcludeList.hxx | 80 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 164 insertions(+), 164 deletions(-) delete mode 100644 src/ExcludeList.cxx delete mode 100644 src/ExcludeList.hxx create mode 100644 src/db/update/ExcludeList.cxx create mode 100644 src/db/update/ExcludeList.hxx diff --git a/Makefile.am b/Makefile.am index 238ea0e7b..c51a12e6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,7 +119,6 @@ src_mpd_SOURCES = \ src/db/DatabaseListener.hxx \ src/db/Visitor.hxx \ src/db/Selection.cxx src/db/Selection.hxx \ - src/ExcludeList.cxx src/ExcludeList.hxx \ src/filter/FilterConfig.cxx src/filter/FilterConfig.hxx \ src/filter/FilterPlugin.cxx src/filter/FilterPlugin.hxx \ src/filter/FilterInternal.hxx \ @@ -134,6 +133,7 @@ src_mpd_SOURCES = \ src/db/update/UpdateContainer.cxx src/db/update/UpdateContainer.hxx \ src/db/update/UpdateInternal.hxx \ src/db/update/UpdateRemove.cxx src/db/update/UpdateRemove.hxx \ + src/db/update/ExcludeList.cxx src/db/update/ExcludeList.hxx \ src/client/Client.cxx src/client/Client.hxx \ src/client/ClientInternal.hxx \ src/client/ClientEvent.cxx \ diff --git a/src/ExcludeList.cxx b/src/ExcludeList.cxx deleted file mode 100644 index 7b691b36b..000000000 --- a/src/ExcludeList.cxx +++ /dev/null @@ -1,83 +0,0 @@ - -/* - * Copyright (C) 2003-2014 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * The .mpdignore backend code. - * - */ - -#include "config.h" -#include "ExcludeList.hxx" -#include "fs/Path.hxx" -#include "fs/FileSystem.hxx" -#include "util/Domain.hxx" -#include "Log.hxx" - -#include -#include -#include - -static constexpr Domain exclude_list_domain("exclude_list"); - -bool -ExcludeList::LoadFile(Path path_fs) -{ - FILE *file = FOpen(path_fs, FOpenMode::ReadText); - if (file == nullptr) { - const int e = errno; - if (e != ENOENT) { - const auto path_utf8 = path_fs.ToUTF8(); - FormatErrno(exclude_list_domain, - "Failed to open %s", - path_utf8.c_str()); - } - - return false; - } - - char line[1024]; - while (fgets(line, sizeof(line), file) != nullptr) { - char *p = strchr(line, '#'); - if (p != nullptr) - *p = 0; - - p = g_strstrip(line); - if (*p != 0) - patterns.emplace_front(p); - } - - fclose(file); - - return true; -} - -bool -ExcludeList::Check(Path name_fs) const -{ - assert(!name_fs.IsNull()); - - /* XXX include full path name in check */ - - for (const auto &i : patterns) - if (i.Check(name_fs.c_str())) - return true; - - return false; -} diff --git a/src/ExcludeList.hxx b/src/ExcludeList.hxx deleted file mode 100644 index 8870664b0..000000000 --- a/src/ExcludeList.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2003-2014 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * The .mpdignore backend code. - * - */ - -#ifndef MPD_EXCLUDE_H -#define MPD_EXCLUDE_H - -#include "Compiler.h" - -#include - -#include - -class Path; - -class ExcludeList { - class Pattern { - GPatternSpec *pattern; - - public: - Pattern(const char *_pattern) - :pattern(g_pattern_spec_new(_pattern)) {} - - Pattern(Pattern &&other) - :pattern(other.pattern) { - other.pattern = nullptr; - } - - ~Pattern() { - g_pattern_spec_free(pattern); - } - - gcc_pure - bool Check(const char *name_fs) const { - return g_pattern_match_string(pattern, name_fs); - } - }; - - std::forward_list patterns; - -public: - gcc_pure - bool IsEmpty() const { - return patterns.empty(); - } - - /** - * Loads and parses a .mpdignore file. - */ - bool LoadFile(Path path_fs); - - /** - * Checks whether one of the patterns in the .mpdignore file matches - * the specified file name. - */ - bool Check(Path name_fs) const; -}; - - -#endif diff --git a/src/db/update/ExcludeList.cxx b/src/db/update/ExcludeList.cxx new file mode 100644 index 000000000..7b691b36b --- /dev/null +++ b/src/db/update/ExcludeList.cxx @@ -0,0 +1,83 @@ + +/* + * Copyright (C) 2003-2014 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* + * The .mpdignore backend code. + * + */ + +#include "config.h" +#include "ExcludeList.hxx" +#include "fs/Path.hxx" +#include "fs/FileSystem.hxx" +#include "util/Domain.hxx" +#include "Log.hxx" + +#include +#include +#include + +static constexpr Domain exclude_list_domain("exclude_list"); + +bool +ExcludeList::LoadFile(Path path_fs) +{ + FILE *file = FOpen(path_fs, FOpenMode::ReadText); + if (file == nullptr) { + const int e = errno; + if (e != ENOENT) { + const auto path_utf8 = path_fs.ToUTF8(); + FormatErrno(exclude_list_domain, + "Failed to open %s", + path_utf8.c_str()); + } + + return false; + } + + char line[1024]; + while (fgets(line, sizeof(line), file) != nullptr) { + char *p = strchr(line, '#'); + if (p != nullptr) + *p = 0; + + p = g_strstrip(line); + if (*p != 0) + patterns.emplace_front(p); + } + + fclose(file); + + return true; +} + +bool +ExcludeList::Check(Path name_fs) const +{ + assert(!name_fs.IsNull()); + + /* XXX include full path name in check */ + + for (const auto &i : patterns) + if (i.Check(name_fs.c_str())) + return true; + + return false; +} diff --git a/src/db/update/ExcludeList.hxx b/src/db/update/ExcludeList.hxx new file mode 100644 index 000000000..8870664b0 --- /dev/null +++ b/src/db/update/ExcludeList.hxx @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2003-2014 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* + * The .mpdignore backend code. + * + */ + +#ifndef MPD_EXCLUDE_H +#define MPD_EXCLUDE_H + +#include "Compiler.h" + +#include + +#include + +class Path; + +class ExcludeList { + class Pattern { + GPatternSpec *pattern; + + public: + Pattern(const char *_pattern) + :pattern(g_pattern_spec_new(_pattern)) {} + + Pattern(Pattern &&other) + :pattern(other.pattern) { + other.pattern = nullptr; + } + + ~Pattern() { + g_pattern_spec_free(pattern); + } + + gcc_pure + bool Check(const char *name_fs) const { + return g_pattern_match_string(pattern, name_fs); + } + }; + + std::forward_list patterns; + +public: + gcc_pure + bool IsEmpty() const { + return patterns.empty(); + } + + /** + * Loads and parses a .mpdignore file. + */ + bool LoadFile(Path path_fs); + + /** + * Checks whether one of the patterns in the .mpdignore file matches + * the specified file name. + */ + bool Check(Path name_fs) const; +}; + + +#endif -- cgit v1.2.3