iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity
Aegisub/src/text_file_reader.cpp

46 lines
1.6 KiB
C++
Raw Normal View History

Relicense all of my stuff that's still 3-BSD to ISC
2012-12-02 22:14:24 +01:00
// Copyright (c) 2012, Thomas Goyne <plorkyeran@aegisub.org>
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Relicense all of my stuff that's still 3-BSD to ISC
2012-12-02 22:14:24 +01:00
// Permission to use, copy, modify, and distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Relicense all of my stuff that's still 3-BSD to ISC
2012-12-02 22:14:24 +01:00
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Switch all headers to using Doxygen and cleanup contact info * Swap old email + website address with 'Aegisub Project http://www.aegisub.org/' * Set categories for all files (jfs) * Add descriptions for each file (jfs) * Add $Id$ keyword Originally committed to SVN as r3310.
2009-07-29 07:43:02 +02:00
// Aegisub Project http://www.aegisub.org/
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include "text_file_reader.h"
Fix non-precompiled header compilation Originally committed to SVN as r4723.
2010-08-03 00:14:11 +02:00
Use read_file_mapping in TextFileReader
2014-03-21 17:28:17 +01:00
#include <libaegisub/file_mapping.h>
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
#include <libaegisub/make_unique.h>
Convert a bunch of wxLog* to the new logging method. Originally committed to SVN as r4399.
2010-06-01 10:21:30 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/trim.hpp>
Use read_file_mapping in TextFileReader
2014-03-21 17:28:17 +01:00
#include <boost/interprocess/streams/bufferstream.hpp>
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
TextFileReader::TextFileReader(agi::fs::path const& filename, std::string encoding, bool trim)
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
: file(agi::make_unique<agi::read_file_mapping>(filename))
, stream(agi::make_unique<boost::interprocess::ibufferstream>(file->read(), file->size()))
Remove the charset detection from TextFileReader since it's never used
2013-04-13 17:15:36 +02:00
, trim(trim)
Use read_file_mapping in TextFileReader
2014-03-21 17:28:17 +01:00
, iter(agi::line_iterator<std::string>(*stream, encoding))
Move most character set conversion code to libaegisub and make everything use the new conversion functionality. Originally committed to SVN as r4423.
2010-06-03 22:32:25 +02:00
{
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
TextFileReader::~TextFileReader() {
}
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
std::string TextFileReader::ReadLineFromFile() {
std::string str = *iter;
Move the bulk of TextFileWriter's logic to libaegisub. Originally committed to SVN as r4660.
2010-07-07 04:41:46 +02:00
++iter;
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
if (trim)
boost::trim(str);
if (boost::starts_with(str, "\xEF\xBB\xBF"))
str.erase(0, 3);
Move the bulk of TextFileWriter's logic to libaegisub. Originally committed to SVN as r4660.
2010-07-07 04:41:46 +02:00
return str;
}