Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted out changes to JFileSystem - WIP, not meant for the tree yet.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2011-06-02 05:39:06 +00:00
parent a06558be55
commit 382fb5969d
2 changed files with 1 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
JGE/include/JFileSystem.h
View File

@@ -28,61 +28,6 @@
using namespace std;
class JFile
{
public:
JFile();
virtual ~JFile();
virtual bool OpenFile(const string &filename);
virtual int ReadFile(void *buffer, int size);
virtual int GetFileSize();
virtual void CloseFile();
protected:
std::string mFilename;
#if defined (PSP)
SceUID mFile;
#else
FILE *mFile;
#endif
int mFileSize;
};
class JZipFile : public JFile
{
public:
JZipFile(const std::string& inZipFilename);
virtual ~JZipFile();
/*
** Access filename within the zip.
*/
virtual bool OpenFile(const string &filename);
virtual int ReadFile(void *buffer, int size);
virtual int GetFileSize();
virtual void CloseFile();
private:
std::string mZipFilename;
unzFile mZipFile;
};
//////////////////////////////////////////////////////////////////////////
/// Interface for low level file access with ZIP archive support. All
/// file operations in JGE are handled through this class so if a ZIP

141
JGE/src/JFileSystem.cpp
View File

@@ -24,136 +24,6 @@
#include <map>
#include <string>
#include "../include/DebugRoutines.h"
#include <fstream>
JFile::JFile() : mFile(0), mFileSize(0)
{
}
JFile::~JFile()
{
}
bool JFile::OpenFile(const string &filename)
{
bool result = false;
mFilename = JFileSystem::GetInstance()->GetResourceRoot() + filename;
#if defined (PSP)
mFile = sceIoOpen(mFilename.c_str(), PSP_O_RDONLY, 0777);
if (mFile > 0)
{
mFileSize = sceIoLseek(mFile, 0, PSP_SEEK_END);
sceIoLseek(mFile, 0, PSP_SEEK_SET);
result = true;
}
#else
mFile = fopen(mFilename.c_str(), "rb");
if (mFile != NULL)
{
fseek(mFile, 0, SEEK_END);
mFileSize = ftell(mFile);
fseek(mFile, 0, SEEK_SET);
result = true;
}
#endif
return result;
}
int JFile::ReadFile(void *buffer, int size)
{
#if defined (PSP)
return sceIoRead(mFile, buffer, size);
#else
return fread(buffer, 1, size, mFile);
#endif
}
int JFile::GetFileSize()
{
return mFileSize;
}
void JFile::CloseFile()
{
#if defined (PSP)
if (mFile > 0)
sceIoClose(mFile);
#else
if (mFile != NULL)
fclose(mFile);
#endif
mFile = 0;
mFileSize = 0;
}
JZipFile::JZipFile(const std::string& inZipFilename)
: mZipFilename(inZipFilename)
{
mZipFile = unzOpen(mZipFilename.c_str());
assert(mZipFile);
if (mZipFile == NULL)
throw;
}
JZipFile::~JZipFile()
{
unzClose(mZipFile);
}
const int kCaseInsensitive = 2;
bool JZipFile::OpenFile(const string &filename)
{
bool result = false;
mFilename = JFileSystem::GetInstance()->GetResourceRoot() + filename;
if (mZipFile)
{
int fileAttempt = unzLocateFile(mZipFile, mFilename.c_str(), kCaseInsensitive);
if (fileAttempt != UNZ_END_OF_LIST_OF_FILE)
{
result = (unzOpenCurrentFile(mZipFile) == UNZ_OK);
}
}
return result;
}
int JZipFile::ReadFile(void *buffer, int size)
{
return unzReadCurrentFile(mZipFile, buffer, size);
}
int JZipFile::GetFileSize()
{
int result = 0;
if (mZipFile != NULL)
{
unz_file_info info;
unzGetCurrentFileInfo(mZipFile, &info, NULL, 0, NULL, 0, NULL, 0);
result = info.uncompressed_size;
}
return result;
}
void JZipFile::CloseFile()
{
if (mZipFile != NULL)
{
unzCloseCurrentFile(mZipFile);
}
}
JZipCache::JZipCache()
{}
@@ -411,16 +281,7 @@ void JFileSystem::SetResourceRoot(const string& resourceRoot)
mResourceRoot = [documentsDirectory cStringUsingEncoding:1];
mResourceRoot += "/";
#elif defined (ANDROID)
mResourceRoot = "/mnt/sdcard-ext/Wagic/Res/";
DebugTrace("test: writing to /sdcard-ext/ ");
std::ofstream file("/mnt/sdcard-ext/Foo.txt");
if (file)
{
DebugTrace("successfully opened foo.txt...");
file << "test";
file.close();
}
mResourceRoot = "/sdcard/Wagic/Res/";
#else
mResourceRoot = resourceRoot;
#endif