oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ArchivePlugin: move instance methods to class ArchiveFile

Browse Source
This commit is contained in:
Max Kellermann
2013-01-29 23:36:58 +01:00
parent 701fff03d2
commit 16afdfd874
9 changed files with 92 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/archive/Bzip2ArchivePlugin.cxx
View File

@@ -42,7 +42,7 @@
#define BZ2_bzDecompress bzDecompress
#endif
class Bzip2ArchiveFile : public ArchiveFile {
class Bzip2ArchiveFile final : public ArchiveFile {
public:
RefCount ref;
@@ -63,6 +63,10 @@ public:
input_stream_close(istream);
}
void Ref() {
ref.Increment();
}
void Unref() {
if (!ref.Decrement())
return;
@@ -70,6 +74,18 @@ public:
g_free(name);
delete this;
}
virtual void Close() override {
Unref();
}
virtual void Visit(ArchiveVisitor &visitor) override {
visitor.VisitArchiveEntry(name);
}
virtual input_stream *OpenStream(const char *path,
Mutex &mutex, Cond &cond,
GError **error_r) override;
};
struct Bzip2InputStream {
@@ -142,22 +158,6 @@ bz2_open(const char *pathname, GError **error_r)
return new Bzip2ArchiveFile(pathname, is);
}
static void
bz2_visit(ArchiveFile *file, ArchiveVisitor &visitor)
{
Bzip2ArchiveFile *context = (Bzip2ArchiveFile *) file;
visitor.VisitArchiveEntry(context->name);
}
static void
bz2_close(ArchiveFile *file)
{
Bzip2ArchiveFile *context = (Bzip2ArchiveFile *) file;
context->Unref();
}
/* single archive handling */
Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context, const char *uri,
@@ -165,7 +165,7 @@ Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context, const char *uri,
:base(bz2_inputplugin, uri, mutex, cond),
archive(&_context), eof(false)
{
archive->ref.Increment();
archive->Ref();
}
Bzip2InputStream::~Bzip2InputStream()
@@ -173,15 +173,12 @@ Bzip2InputStream::~Bzip2InputStream()
archive->Unref();
}
static struct input_stream *
bz2_open_stream(ArchiveFile *file, const char *path,
Mutex &mutex, Cond &cond,
GError **error_r)
input_stream *
Bzip2ArchiveFile::OpenStream(const char *path,
Mutex &mutex, Cond &cond,
GError **error_r)
{
Bzip2ArchiveFile *context = (Bzip2ArchiveFile *) file;
Bzip2InputStream *bis =
new Bzip2InputStream(*context, path, mutex, cond);
Bzip2InputStream *bis = new Bzip2InputStream(*this, path, mutex, cond);
if (!bis->Open(error_r)) {
delete bis;
return NULL;
@@ -296,9 +293,6 @@ const struct archive_plugin bz2_archive_plugin = {
nullptr,
nullptr,
bz2_open,
bz2_visit,
bz2_open_stream,
bz2_close,
bz2_extensions,
};

48
src/archive/Iso9660ArchivePlugin.cxx
View File

@@ -41,7 +41,7 @@
#define CEILING(x, y) ((x+(y-1))/y)
class Iso9660ArchiveFile : public ArchiveFile {
class Iso9660ArchiveFile final : public ArchiveFile {
public:
RefCount ref;
@@ -60,6 +60,16 @@ public:
}
void Visit(const char *path, ArchiveVisitor &visitor);
virtual void Close() override {
Unref();
}
virtual void Visit(ArchiveVisitor &visitor) override;
virtual input_stream *OpenStream(const char *path,
Mutex &mutex, Cond &cond,
GError **error_r) override;
};
extern const struct input_plugin iso9660_input_plugin;
@@ -118,22 +128,10 @@ iso9660_archive_open(const char *pathname, GError **error_r)
return new Iso9660ArchiveFile(iso);
}
static void
iso9660_archive_visit(ArchiveFile *file, ArchiveVisitor &visitor)
void
Iso9660ArchiveFile::Visit(ArchiveVisitor &visitor)
{
Iso9660ArchiveFile *context =
(Iso9660ArchiveFile *)file;
context->Visit("/", visitor);
}
static void
iso9660_archive_close(ArchiveFile *file)
{
Iso9660ArchiveFile *context =
(Iso9660ArchiveFile *)file;
context->Unref();
Visit("/", visitor);
}
/* single archive handling */
@@ -165,15 +163,12 @@ struct Iso9660InputStream {
}
};
static struct input_stream *
iso9660_archive_open_stream(ArchiveFile *file, const char *pathname,
Mutex &mutex, Cond &cond,
GError **error_r)
input_stream *
Iso9660ArchiveFile::OpenStream(const char *pathname,
Mutex &mutex, Cond &cond,
GError **error_r)
{
Iso9660ArchiveFile *context =
(Iso9660ArchiveFile *)file;
auto statbuf = iso9660_ifs_stat_translate(context->iso, pathname);
auto statbuf = iso9660_ifs_stat_translate(iso, pathname);
if (statbuf == nullptr) {
g_set_error(error_r, iso9660_quark(), 0,
"not found in the ISO file: %s", pathname);
@@ -181,7 +176,7 @@ iso9660_archive_open_stream(ArchiveFile *file, const char *pathname,
}
Iso9660InputStream *iis =
new Iso9660InputStream(*context, pathname, mutex, cond,
new Iso9660InputStream(*this, pathname, mutex, cond,
statbuf);
return &iis->base;
}
@@ -267,8 +262,5 @@ const struct archive_plugin iso9660_archive_plugin = {
nullptr,
nullptr,
iso9660_archive_open,
iso9660_archive_visit,
iso9660_archive_open_stream,
iso9660_archive_close,
iso9660_archive_extensions,
};

46
src/archive/ZzipArchivePlugin.cxx
View File

@@ -35,7 +35,7 @@
#include <glib.h>
#include <string.h>
class ZzipArchiveFile : public ArchiveFile {
class ZzipArchiveFile final : public ArchiveFile {
public:
RefCount ref;
@@ -53,7 +53,15 @@ public:
delete this;
}
void Visit(ArchiveVisitor &visitor);
virtual void Close() override {
Unref();
}
virtual void Visit(ArchiveVisitor &visitor) override;
virtual input_stream *OpenStream(const char *path,
Mutex &mutex, Cond &cond,
GError **error_r) override;
};
extern const struct input_plugin zzip_input_plugin;
@@ -91,22 +99,6 @@ ZzipArchiveFile::Visit(ArchiveVisitor &visitor)
visitor.VisitArchiveEntry(dirent.d_name);
}
static void
zzip_archive_visit(ArchiveFile *file, ArchiveVisitor &visitor)
{
ZzipArchiveFile *context = (ZzipArchiveFile *) file;
context->Visit(visitor);
}
static void
zzip_archive_close(ArchiveFile *file)
{
ZzipArchiveFile *context = (ZzipArchiveFile *) file;
context->Unref();
}
/* single archive handling */
struct ZzipInputStream {
@@ -138,15 +130,12 @@ struct ZzipInputStream {
}
};
static struct input_stream *
zzip_archive_open_stream(ArchiveFile *file,
const char *pathname,
Mutex &mutex, Cond &cond,
GError **error_r)
input_stream *
ZzipArchiveFile::OpenStream(const char *pathname,
Mutex &mutex, Cond &cond,
GError **error_r)
{
ZzipArchiveFile *context = (ZzipArchiveFile *) file;
ZZIP_FILE *_file = zzip_file_open(context->dir, pathname, 0);
ZZIP_FILE *_file = zzip_file_open(dir, pathname, 0);
if (_file == nullptr) {
g_set_error(error_r, zzip_quark(), 0,
"not found in the ZIP file: %s", pathname);
@@ -154,7 +143,7 @@ zzip_archive_open_stream(ArchiveFile *file,
}
ZzipInputStream *zis =
new ZzipInputStream(*context, pathname,
new ZzipInputStream(*this, pathname,
mutex, cond,
_file);
return &zis->base;
@@ -237,8 +226,5 @@ const struct archive_plugin zzip_archive_plugin = {
nullptr,
nullptr,
zzip_archive_open,
zzip_archive_visit,
zzip_archive_open_stream,
zzip_archive_close,
zzip_archive_extensions,
};