mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Originally committed to SVN as r2466.

Browse source
This commit is contained in:
Rodrigo Braz Monteiro 2008-11-20 04:05:05 +00:00
parent 6f94248289
commit 671a788abc
6 changed files with 162 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
athenasub/athenasub_2008.vcproj
View file

@ -475,6 +475,14 @@
RelativePath=".\src\text_reader.h"
>
</File>
<File
RelativePath=".\src\text_reader_cache.cpp"
>
</File>
<File
RelativePath=".\src\text_reader_cache.h"
>
</File>
<File
RelativePath=".\src\text_writer.cpp"
>

2
athenasub/src/text_file_reader.cpp
View file

@ -250,5 +250,5 @@ String TextFileReader::GetCurrentEncoding()
// Rewind the file
void TextFileReader::Rewind()
{
THROW_ATHENA_EXCEPTION(Exception::TODO);
}

4
athenasub/src/text_reader.cpp
View file

@ -37,9 +37,11 @@
// Headers
#include "text_reader.h"
#include "text_file_reader.h"
#include "text_reader_cache.h"
using namespace Athenasub;
shared_ptr<TextReader> TextReader::GetReader(wxInputStream &stream,String encoding)
{
return shared_ptr<TextReader>(new TextFileReader(stream,encoding));
shared_ptr<TextReader> fileReader = shared_ptr<TextReader>(new TextFileReader(stream,encoding));
return shared_ptr<TextReader>(new TextReaderCache(fileReader));
}

85
athenasub/src/text_reader_cache.cpp Normal file
View file

@ -0,0 +1,85 @@
// Copyright (c) 2008, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
// Headers
#include "text_reader_cache.h"
using namespace Athenasub;
Athenasub::TextReaderCache::TextReaderCache(shared_ptr<TextReader> src)
: source(src)
{
bufferPos = 0;
}
String TextReaderCache::ReadLineFromFile()
{
if (bufferPos == buffer.size()) {
LoadMore(10);
}
if (bufferPos == buffer.size()) {
return "";
}
return buffer[bufferPos++];
}
bool TextReaderCache::HasMoreLines()
{
if (bufferPos != buffer.size())
return true;
else
return CanLoadMore();
}
void TextReaderCache::Rewind()
{
bufferPos = 0;
}
void Athenasub::TextReaderCache::LoadMore(int n)
{
for (int i=0;i<n;i++) {
if (CanLoadMore())
buffer.push_back(source->ReadLineFromFile());
else
return;
}
}
bool Athenasub::TextReaderCache::CanLoadMore()
{
return source->HasMoreLines();
}

64
athenasub/src/text_reader_cache.h Normal file
View file

@ -0,0 +1,64 @@
// Copyright (c) 2008, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
// Headers
#include "athenasub.h"
#include "text_reader.h"
namespace Athenasub {
class TextReaderCache : public TextReader {
private:
std::vector<String> buffer;
size_t bufferPos;
shared_ptr<TextReader> source;
void LoadMore(int n=1);
bool CanLoadMore();
public:
TextReaderCache(shared_ptr<TextReader> source);
virtual ~TextReaderCache() {}
virtual String ReadLineFromFile();
virtual bool HasMoreLines();
virtual void Rewind();
};
}

2
unit_test/src/athenasub/test_file.cpp
View file

@ -40,7 +40,7 @@
#include <iostream>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "../../../athenasub/include/athenasub/athenasub.h"
#include "athenasub/athenasub.h"
using namespace Athenasub;