archive/*: move to archive/plugins/

This commit is contained in:
Max Kellermann
2014-01-24 00:09:37 +01:00
parent 51adaf2c47
commit 4aa6d39fd8
25 changed files with 43 additions and 43 deletions

View File

@@ -0,0 +1,292 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* single bz2 archive handling (requires libbz2)
*/
#include "config.h"
#include "Bzip2ArchivePlugin.hxx"
#include "../ArchivePlugin.hxx"
#include "../ArchiveFile.hxx"
#include "../ArchiveVisitor.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/RefCount.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "fs/Traits.hxx"
#include <bzlib.h>
#include <stddef.h>
#ifdef HAVE_OLDER_BZIP2
#define BZ2_bzDecompressInit bzDecompressInit
#define BZ2_bzDecompress bzDecompress
#endif
class Bzip2ArchiveFile final : public ArchiveFile {
public:
RefCount ref;
std::string name;
InputStream *const istream;
Bzip2ArchiveFile(const char *path, InputStream *_is)
:ArchiveFile(bz2_archive_plugin),
name(PathTraitsUTF8::GetBase(path)),
istream(_is) {
// remove .bz2 suffix
const size_t len = name.length();
if (len > 4)
name.erase(len - 4);
}
~Bzip2ArchiveFile() {
istream->Close();
}
void Ref() {
ref.Increment();
}
void Unref() {
if (!ref.Decrement())
return;
delete this;
}
virtual void Close() override {
Unref();
}
virtual void Visit(ArchiveVisitor &visitor) override {
visitor.VisitArchiveEntry(name.c_str());
}
virtual InputStream *OpenStream(const char *path,
Mutex &mutex, Cond &cond,
Error &error) override;
};
struct Bzip2InputStream {
InputStream base;
Bzip2ArchiveFile *archive;
bool eof;
bz_stream bzstream;
char buffer[5000];
Bzip2InputStream(Bzip2ArchiveFile &context, const char *uri,
Mutex &mutex, Cond &cond);
~Bzip2InputStream();
bool Open(Error &error);
void Close();
};
extern const InputPlugin bz2_inputplugin;
static constexpr Domain bz2_domain("bz2");
/* single archive handling allocation helpers */
inline bool
Bzip2InputStream::Open(Error &error)
{
bzstream.bzalloc = nullptr;
bzstream.bzfree = nullptr;
bzstream.opaque = nullptr;
bzstream.next_in = (char *)buffer;
bzstream.avail_in = 0;
int ret = BZ2_bzDecompressInit(&bzstream, 0, 0);
if (ret != BZ_OK) {
error.Set(bz2_domain, ret,
"BZ2_bzDecompressInit() has failed");
return false;
}
base.ready = true;
return true;
}
inline void
Bzip2InputStream::Close()
{
BZ2_bzDecompressEnd(&bzstream);
}
/* archive open && listing routine */
static ArchiveFile *
bz2_open(const char *pathname, Error &error)
{
static Mutex mutex;
static Cond cond;
InputStream *is = InputStream::OpenReady(pathname, mutex, cond, error);
if (is == nullptr)
return nullptr;
return new Bzip2ArchiveFile(pathname, is);
}
/* single archive handling */
Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context, const char *uri,
Mutex &mutex, Cond &cond)
:base(bz2_inputplugin, uri, mutex, cond),
archive(&_context), eof(false)
{
archive->Ref();
}
Bzip2InputStream::~Bzip2InputStream()
{
archive->Unref();
}
InputStream *
Bzip2ArchiveFile::OpenStream(const char *path,
Mutex &mutex, Cond &cond,
Error &error)
{
Bzip2InputStream *bis = new Bzip2InputStream(*this, path, mutex, cond);
if (!bis->Open(error)) {
delete bis;
return nullptr;
}
return &bis->base;
}
static void
bz2_is_close(InputStream *is)
{
Bzip2InputStream *bis = (Bzip2InputStream *)is;
bis->Close();
delete bis;
}
static bool
bz2_fillbuffer(Bzip2InputStream *bis, Error &error)
{
size_t count;
bz_stream *bzstream;
bzstream = &bis->bzstream;
if (bzstream->avail_in > 0)
return true;
count = bis->archive->istream->Read(bis->buffer, sizeof(bis->buffer),
error);
if (count == 0)
return false;
bzstream->next_in = bis->buffer;
bzstream->avail_in = count;
return true;
}
static size_t
bz2_is_read(InputStream *is, void *ptr, size_t length,
Error &error)
{
Bzip2InputStream *bis = (Bzip2InputStream *)is;
bz_stream *bzstream;
int bz_result;
size_t nbytes = 0;
if (bis->eof)
return 0;
bzstream = &bis->bzstream;
bzstream->next_out = (char *)ptr;
bzstream->avail_out = length;
do {
if (!bz2_fillbuffer(bis, error))
return 0;
bz_result = BZ2_bzDecompress(bzstream);
if (bz_result == BZ_STREAM_END) {
bis->eof = true;
break;
}
if (bz_result != BZ_OK) {
error.Set(bz2_domain, bz_result,
"BZ2_bzDecompress() has failed");
return 0;
}
} while (bzstream->avail_out == length);
nbytes = length - bzstream->avail_out;
is->offset += nbytes;
return nbytes;
}
static bool
bz2_is_eof(InputStream *is)
{
Bzip2InputStream *bis = (Bzip2InputStream *)is;
return bis->eof;
}
/* exported structures */
static const char *const bz2_extensions[] = {
"bz2",
nullptr
};
const InputPlugin bz2_inputplugin = {
nullptr,
nullptr,
nullptr,
nullptr,
bz2_is_close,
nullptr,
nullptr,
nullptr,
nullptr,
bz2_is_read,
bz2_is_eof,
nullptr,
};
const struct archive_plugin bz2_archive_plugin = {
"bz2",
nullptr,
nullptr,
bz2_open,
bz2_extensions,
};

View File

@@ -0,0 +1,25 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_ARCHIVE_BZ2_HXX
#define MPD_ARCHIVE_BZ2_HXX
extern const struct archive_plugin bz2_archive_plugin;
#endif

View File

@@ -0,0 +1,275 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* iso archive handling (requires cdio, and iso9660)
*/
#include "config.h"
#include "Iso9660ArchivePlugin.hxx"
#include "../ArchivePlugin.hxx"
#include "../ArchiveFile.hxx"
#include "../ArchiveVisitor.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/RefCount.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include <cdio/iso9660.h>
#include <stdlib.h>
#include <string.h>
#define CEILING(x, y) ((x+(y-1))/y)
class Iso9660ArchiveFile final : public ArchiveFile {
RefCount ref;
iso9660_t *iso;
public:
Iso9660ArchiveFile(iso9660_t *_iso)
:ArchiveFile(iso9660_archive_plugin), iso(_iso) {}
~Iso9660ArchiveFile() {
iso9660_close(iso);
}
void Ref() {
ref.Increment();
}
void Unref() {
if (ref.Decrement())
delete this;
}
long SeekRead(void *ptr, lsn_t start, long int i_size) const {
return iso9660_iso_seek_read(iso, ptr, start, i_size);
}
void Visit(const char *path, ArchiveVisitor &visitor);
virtual void Close() override {
Unref();
}
virtual void Visit(ArchiveVisitor &visitor) override;
virtual InputStream *OpenStream(const char *path,
Mutex &mutex, Cond &cond,
Error &error) override;
};
extern const InputPlugin iso9660_input_plugin;
static constexpr Domain iso9660_domain("iso9660");
/* archive open && listing routine */
inline void
Iso9660ArchiveFile::Visit(const char *psz_path, ArchiveVisitor &visitor)
{
CdioList_t *entlist;
CdioListNode_t *entnode;
iso9660_stat_t *statbuf;
char pathname[4096];
entlist = iso9660_ifs_readdir (iso, psz_path);
if (!entlist) {
return;
}
/* Iterate over the list of nodes that iso9660_ifs_readdir gives */
_CDIO_LIST_FOREACH (entnode, entlist) {
statbuf = (iso9660_stat_t *) _cdio_list_node_data (entnode);
strcpy(pathname, psz_path);
strcat(pathname, statbuf->filename);
if (iso9660_stat_s::_STAT_DIR == statbuf->type ) {
if (strcmp(statbuf->filename, ".") && strcmp(statbuf->filename, "..")) {
strcat(pathname, "/");
Visit(pathname, visitor);
}
} else {
//remove leading /
visitor.VisitArchiveEntry(pathname + 1);
}
}
_cdio_list_free (entlist, true);
}
static ArchiveFile *
iso9660_archive_open(const char *pathname, Error &error)
{
/* open archive */
auto iso = iso9660_open(pathname);
if (iso == nullptr) {
error.Format(iso9660_domain,
"Failed to open ISO9660 file %s", pathname);
return nullptr;
}
return new Iso9660ArchiveFile(iso);
}
void
Iso9660ArchiveFile::Visit(ArchiveVisitor &visitor)
{
Visit("/", visitor);
}
/* single archive handling */
class Iso9660InputStream {
InputStream base;
Iso9660ArchiveFile &archive;
iso9660_stat_t *statbuf;
public:
Iso9660InputStream(Iso9660ArchiveFile &_archive, const char *uri,
Mutex &mutex, Cond &cond,
iso9660_stat_t *_statbuf)
:base(iso9660_input_plugin, uri, mutex, cond),
archive(_archive), statbuf(_statbuf) {
base.ready = true;
base.size = statbuf->size;
archive.Ref();
}
~Iso9660InputStream() {
free(statbuf);
archive.Unref();
}
InputStream *Get() {
return &base;
}
size_t Read(void *ptr, size_t size, Error &error);
};
InputStream *
Iso9660ArchiveFile::OpenStream(const char *pathname,
Mutex &mutex, Cond &cond,
Error &error)
{
auto statbuf = iso9660_ifs_stat_translate(iso, pathname);
if (statbuf == nullptr) {
error.Format(iso9660_domain,
"not found in the ISO file: %s", pathname);
return nullptr;
}
Iso9660InputStream *iis =
new Iso9660InputStream(*this, pathname, mutex, cond,
statbuf);
return iis->Get();
}
static void
iso9660_input_close(InputStream *is)
{
Iso9660InputStream *iis = (Iso9660InputStream *)is;
delete iis;
}
inline size_t
Iso9660InputStream::Read(void *ptr, size_t size, Error &error)
{
int readed = 0;
int no_blocks, cur_block;
size_t left_bytes = statbuf->size - base.offset;
if (left_bytes < size) {
no_blocks = CEILING(left_bytes,ISO_BLOCKSIZE);
} else {
no_blocks = size / ISO_BLOCKSIZE;
}
if (no_blocks == 0)
return 0;
cur_block = base.offset / ISO_BLOCKSIZE;
readed = archive.SeekRead(ptr, statbuf->lsn + cur_block,
no_blocks);
if (readed != no_blocks * ISO_BLOCKSIZE) {
error.Format(iso9660_domain,
"error reading ISO file at lsn %lu",
(unsigned long)cur_block);
return 0;
}
if (left_bytes < size) {
readed = left_bytes;
}
base.offset += readed;
return readed;
}
static size_t
iso9660_input_read(InputStream *is, void *ptr, size_t size,
Error &error)
{
Iso9660InputStream *iis = (Iso9660InputStream *)is;
return iis->Read(ptr, size, error);
}
static bool
iso9660_input_eof(InputStream *is)
{
return is->offset == is->size;
}
/* exported structures */
static const char *const iso9660_archive_extensions[] = {
"iso",
nullptr
};
const InputPlugin iso9660_input_plugin = {
nullptr,
nullptr,
nullptr,
nullptr,
iso9660_input_close,
nullptr,
nullptr,
nullptr,
nullptr,
iso9660_input_read,
iso9660_input_eof,
nullptr,
};
const struct archive_plugin iso9660_archive_plugin = {
"iso",
nullptr,
nullptr,
iso9660_archive_open,
iso9660_archive_extensions,
};

View File

@@ -0,0 +1,25 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_ARCHIVE_ISO9660_HXX
#define MPD_ARCHIVE_ISO9660_HXX
extern const struct archive_plugin iso9660_archive_plugin;
#endif

View File

@@ -0,0 +1,223 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* zip archive handling (requires zziplib)
*/
#include "config.h"
#include "ZzipArchivePlugin.hxx"
#include "../ArchivePlugin.hxx"
#include "../ArchiveFile.hxx"
#include "../ArchiveVisitor.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/RefCount.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include <zzip/zzip.h>
class ZzipArchiveFile final : public ArchiveFile {
public:
RefCount ref;
ZZIP_DIR *const dir;
ZzipArchiveFile(ZZIP_DIR *_dir)
:ArchiveFile(zzip_archive_plugin), dir(_dir) {}
~ZzipArchiveFile() {
zzip_dir_close(dir);
}
void Unref() {
if (ref.Decrement())
delete this;
}
virtual void Close() override {
Unref();
}
virtual void Visit(ArchiveVisitor &visitor) override;
virtual InputStream *OpenStream(const char *path,
Mutex &mutex, Cond &cond,
Error &error) override;
};
extern const InputPlugin zzip_input_plugin;
static constexpr Domain zzip_domain("zzip");
/* archive open && listing routine */
static ArchiveFile *
zzip_archive_open(const char *pathname, Error &error)
{
ZZIP_DIR *dir = zzip_dir_open(pathname, nullptr);
if (dir == nullptr) {
error.Format(zzip_domain, "Failed to open ZIP file %s",
pathname);
return nullptr;
}
return new ZzipArchiveFile(dir);
}
inline void
ZzipArchiveFile::Visit(ArchiveVisitor &visitor)
{
zzip_rewinddir(dir);
ZZIP_DIRENT dirent;
while (zzip_dir_read(dir, &dirent))
//add only files
if (dirent.st_size > 0)
visitor.VisitArchiveEntry(dirent.d_name);
}
/* single archive handling */
struct ZzipInputStream {
InputStream base;
ZzipArchiveFile *archive;
ZZIP_FILE *file;
ZzipInputStream(ZzipArchiveFile &_archive, const char *uri,
Mutex &mutex, Cond &cond,
ZZIP_FILE *_file)
:base(zzip_input_plugin, uri, mutex, cond),
archive(&_archive), file(_file) {
base.ready = true;
//we are seekable (but its not recommendent to do so)
base.seekable = true;
ZZIP_STAT z_stat;
zzip_file_stat(file, &z_stat);
base.size = z_stat.st_size;
archive->ref.Increment();
}
~ZzipInputStream() {
zzip_file_close(file);
archive->Unref();
}
};
InputStream *
ZzipArchiveFile::OpenStream(const char *pathname,
Mutex &mutex, Cond &cond,
Error &error)
{
ZZIP_FILE *_file = zzip_file_open(dir, pathname, 0);
if (_file == nullptr) {
error.Format(zzip_domain, "not found in the ZIP file: %s",
pathname);
return nullptr;
}
ZzipInputStream *zis =
new ZzipInputStream(*this, pathname,
mutex, cond,
_file);
return &zis->base;
}
static void
zzip_input_close(InputStream *is)
{
ZzipInputStream *zis = (ZzipInputStream *)is;
delete zis;
}
static size_t
zzip_input_read(InputStream *is, void *ptr, size_t size,
Error &error)
{
ZzipInputStream *zis = (ZzipInputStream *)is;
int ret;
ret = zzip_file_read(zis->file, ptr, size);
if (ret < 0) {
error.Set(zzip_domain, "zzip_file_read() has failed");
return 0;
}
is->offset = zzip_tell(zis->file);
return ret;
}
static bool
zzip_input_eof(InputStream *is)
{
ZzipInputStream *zis = (ZzipInputStream *)is;
return (InputPlugin::offset_type)zzip_tell(zis->file) == is->size;
}
static bool
zzip_input_seek(InputStream *is, InputPlugin::offset_type offset,
int whence, Error &error)
{
ZzipInputStream *zis = (ZzipInputStream *)is;
zzip_off_t ofs = zzip_seek(zis->file, offset, whence);
if (ofs != -1) {
error.Set(zzip_domain, "zzip_seek() has failed");
is->offset = ofs;
return true;
}
return false;
}
/* exported structures */
static const char *const zzip_archive_extensions[] = {
"zip",
nullptr
};
const InputPlugin zzip_input_plugin = {
nullptr,
nullptr,
nullptr,
nullptr,
zzip_input_close,
nullptr,
nullptr,
nullptr,
nullptr,
zzip_input_read,
zzip_input_eof,
zzip_input_seek,
};
const struct archive_plugin zzip_archive_plugin = {
"zzip",
nullptr,
nullptr,
zzip_archive_open,
zzip_archive_extensions,
};

View File

@@ -0,0 +1,25 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_ARCHIVE_ZZIP_HXX
#define MPD_ARCHIVE_ZZIP_HXX
extern const struct archive_plugin zzip_archive_plugin;
#endif