diff --git a/app/app.pro b/app/app.pro index 83a8e56..647355f 100644 --- a/app/app.pro +++ b/app/app.pro @@ -108,6 +108,7 @@ SOURCES += \ src/BooksTextView.cpp \ src/expat.c \ src/libudev.c \ + src/magic.c \ src/main.cpp \ src/ZLApplication.cpp \ src/ZLibrary.cpp diff --git a/app/src/magic.c b/app/src/magic.c new file mode 100644 index 0000000..53d6b60 --- /dev/null +++ b/app/src/magic.c @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2015 Jolla Ltd. + * Contact: Slava Monich + * + * You may use this file under the terms of the BSD license as follows: + * + * 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 Nemo Mobile 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. + */ + +#include +#include +#include + +#define MAGIC_FUNCTIONS(f) \ + f(void, magic_close, \ + (magic_t cookie), (cookie), (void)0) \ + f(int, magic_load, \ + (magic_t cookie, const char* path), (cookie, path), -1) \ + f(const char*, magic_file, \ + (magic_t cookie, const char* path), (cookie, path), NULL) + +static struct { + void* handle; + union { + struct magic_proc { + magic_t (*magic_open)(int flags); + #define FN_POINTER(type,name,params,args,fail) type (* name) params; + MAGIC_FUNCTIONS(FN_POINTER) + } magic; + void* entry[1]; + } fn; +} magic; + +static const char* magic_names[] = { + "magic_open", + #define FN_NAME(type,name,params,args,fail) #name, + MAGIC_FUNCTIONS(FN_NAME) +}; + +#define MAGIC_NUM_FUNCTIONS (sizeof(magic_names)/sizeof(magic_names[0])) +#define MAGIC_NO_HANDLE ((void*)-1) +#define MAGIC_SO "/usr/lib/libmagic.so.1" + +/* magic_open() is the special function where we load the library */ +magic_t magic_open(int flags) +{ + if (!magic.handle) { + magic.handle = dlopen(MAGIC_SO, RTLD_LAZY); + if (magic.handle) { + unsigned int i; + for (i=0; i class ZLUnixFSManager : public ZLFSManager { protected: + ZLUnixFSManager(); + ~ZLUnixFSManager(); + void normalizeRealPath(std::string &path) const; private: @@ -34,6 +38,7 @@ private: ZLInputStream *createPlainInputStream(const std::string &path) const; ZLOutputStream *createOutputStream(const std::string &path) const; bool removeFile(const std::string &path) const; + std::string mimeType(const std::string &path) const; ZLFileInfo fileInfo(const std::string &path) const; @@ -43,6 +48,9 @@ private: std::string parentPath(const std::string &path) const; bool canRemoveFile(const std::string &path) const; + +private: + magic_t myMagic; }; #endif /* __ZLUNIXFSMANAGER_H__ */ diff --git a/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp b/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp index 443111c..0d91e03 100644 --- a/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp +++ b/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp @@ -29,8 +29,3 @@ std::string ZLQtFSManager::convertFilenameToUtf8(const std::string &name) const QString qString = QString::fromLocal8Bit(name.c_str()); return (qString == QString::null) ? "" : (const char*)qString.toUtf8(); } - -std::string ZLQtFSManager::mimeType(const std::string &path) const { - // TODO: implement - return std::string(); -} diff --git a/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h b/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h index 404afbe..c56c7ec 100644 --- a/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h +++ b/fbreader/fbreader/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h @@ -32,7 +32,6 @@ private: protected: std::string convertFilenameToUtf8(const std::string &name) const; - std::string mimeType(const std::string &path) const; }; #endif /* __ZLQTFSMANAGER_H__ */ diff --git a/rpm/harbour-books.spec b/rpm/harbour-books.spec index 58b89f5..f8ab077 100644 --- a/rpm/harbour-books.spec +++ b/rpm/harbour-books.spec @@ -17,6 +17,7 @@ BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(mlite5) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(systemd) +BuildRequires: file-devel BuildRequires: bzip2-devel BuildRequires: desktop-file-utils BuildRequires: qt5-qttools-linguist