From c3f80439a841120d7e17108da11cc343d5168b8c Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 29 Mar 2010 07:34:34 +0200 Subject: new file classes for text and binary files --- src/base/language.cpp | 4 +-- src/utils/binary_file.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++++ src/utils/binary_file.hpp | 53 +++++++++++++++++++++++++++++++ src/utils/file.cpp | 59 ----------------------------------- src/utils/file.hpp | 8 +---- src/utils/unicode_file.cpp | 69 +++++++++++++++++++++++++++++++++++++++++ src/utils/unicode_file.hpp | 51 ++++++++++++++++++++++++++++++ 7 files changed, 253 insertions(+), 68 deletions(-) create mode 100644 src/utils/binary_file.cpp create mode 100644 src/utils/binary_file.hpp delete mode 100644 src/utils/file.cpp create mode 100644 src/utils/unicode_file.cpp create mode 100644 src/utils/unicode_file.hpp (limited to 'src') diff --git a/src/base/language.cpp b/src/base/language.cpp index 9112c388..646194c2 100644 --- a/src/base/language.cpp +++ b/src/base/language.cpp @@ -29,7 +29,7 @@ #include #include "language.hpp" -#include "utils/file.hpp" +#include "utils/unicode_file.hpp" // namespace alias for shorter class names namespace fs = boost::filesystem; @@ -117,7 +117,7 @@ namespace usdx std::map *map = new std::map(); - File source(source_path); + UnicodeFile source(source_path); bool started = false; std::wstring line; diff --git a/src/utils/binary_file.cpp b/src/utils/binary_file.cpp new file mode 100644 index 00000000..d9b164e6 --- /dev/null +++ b/src/utils/binary_file.cpp @@ -0,0 +1,77 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#include "binary_file.hpp" +#include + +namespace usdx +{ + BinaryFile::BinaryFile(const std::string& filename) : file(filename.c_str(), std::ifstream::in | std::ifstream::binary), content(NULL) + { + } + + BinaryFile::BinaryFile(const boost::filesystem::wpath& path) : file(path, std::ifstream::in | std::ifstream::binary), content(NULL) + { + } + + BinaryFile::~BinaryFile(void) + { + if (content) { + delete[] content; + content = NULL; + } + + file.close(); + } + + std::istream &BinaryFile::stream(void) + { + return file; + } + + const std::streamsize BinaryFile::get_filesize(void) + { + std::streampos position = stream().tellg(); + + stream().seekg (0, std::ios::end); + std::streamsize length = stream().tellg(); + stream().seekg (position); + + return length; + } + + const void* BinaryFile::get_content(void) + { + if (content == NULL) { + std::streamsize length = get_filesize(); + + content = new char[length]; + stream().read(content, length); + } + + return (void*)content; + } +}; diff --git a/src/utils/binary_file.hpp b/src/utils/binary_file.hpp new file mode 100644 index 00000000..d2ab210e --- /dev/null +++ b/src/utils/binary_file.hpp @@ -0,0 +1,53 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#ifndef BINARY_FILE_HPP +#define BINARY_FILE_HPP + +#include +#include "file.hpp" + +namespace usdx +{ + class BinaryFile : public File + { + private: + boost::filesystem::ifstream file; + char* content; + + public: + BinaryFile(const std::string& filename); + BinaryFile(const boost::filesystem::wpath& path); + virtual ~BinaryFile(void); + + std::istream &stream(void); + const std::streamsize get_filesize(void); + + const void* get_content(void); + }; +}; + +#endif diff --git a/src/utils/file.cpp b/src/utils/file.cpp deleted file mode 100644 index f97fc2e4..00000000 --- a/src/utils/file.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * UltraStar Deluxe - Karaoke Game - * - * UltraStar Deluxe is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * 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; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - */ - -#include "file.hpp" -#include -#include - -#include - -namespace usdx -{ - File::File(const std::string& filename) : file(filename.c_str(), std::wifstream::in) - { - std::locale global_loc = std::locale(); - std::locale loc(global_loc, new boost::program_options::detail::utf8_codecvt_facet()); - file.imbue(loc); - } - - File::File(const boost::filesystem::wpath& path) : file(path, std::wifstream::in) - { - std::locale global_loc = std::locale(); - std::locale loc(global_loc, new boost::program_options::detail::utf8_codecvt_facet()); - file.imbue(loc); - } - - File::~File(void) - { - file.close(); - } - - std::wistream &File::stream(void) - { - return file; - } - -}; diff --git a/src/utils/file.hpp b/src/utils/file.hpp index 87aba35c..9e96fb60 100644 --- a/src/utils/file.hpp +++ b/src/utils/file.hpp @@ -34,14 +34,8 @@ namespace usdx { class File { - private: - boost::filesystem::wifstream file; public: - File(const std::string& filename); - File(const boost::filesystem::wpath& path); - virtual ~File(void); - - std::wistream &stream(void); + virtual const std::streamsize get_filesize(void) = 0; }; }; diff --git a/src/utils/unicode_file.cpp b/src/utils/unicode_file.cpp new file mode 100644 index 00000000..c47bfd36 --- /dev/null +++ b/src/utils/unicode_file.cpp @@ -0,0 +1,69 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#include "unicode_file.hpp" +#include +#include + +#include + +namespace usdx +{ + UnicodeFile::UnicodeFile(const std::string& filename) : file(filename.c_str(), std::wifstream::in) + { + std::locale global_loc = std::locale(); + std::locale loc(global_loc, new boost::program_options::detail::utf8_codecvt_facet()); + file.imbue(loc); + } + + UnicodeFile::UnicodeFile(const boost::filesystem::wpath& path) : file(path, std::wifstream::in) + { + std::locale global_loc = std::locale(); + std::locale loc(global_loc, new boost::program_options::detail::utf8_codecvt_facet()); + file.imbue(loc); + } + + UnicodeFile::~UnicodeFile(void) + { + file.close(); + } + + boost::filesystem::wifstream &UnicodeFile::stream(void) + { + return file; + } + + const std::streamsize UnicodeFile::get_filesize(void) + { + std::streampos position = stream().tellg(); + + stream().seekg (0, std::ios::end); + std::streamsize length = stream().tellg(); + stream().seekg (position); + + return length; + } +}; diff --git a/src/utils/unicode_file.hpp b/src/utils/unicode_file.hpp new file mode 100644 index 00000000..d135d796 --- /dev/null +++ b/src/utils/unicode_file.hpp @@ -0,0 +1,51 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#ifndef UNICODE_FILE_HPP +#define UNICODE_FILE_HPP + +#include +#include +#include "file.hpp" + +namespace usdx +{ + class UnicodeFile : public File + { + private: + boost::filesystem::wifstream file; + + public: + UnicodeFile(const std::string& filename); + UnicodeFile(const boost::filesystem::wpath& path); + virtual ~UnicodeFile(void); + + boost::filesystem::wifstream &stream(void); + const std::streamsize get_filesize(void); + }; +}; + +#endif -- cgit v1.2.3