Initial commit.

ext/strawberry-tagreader/CMakeLists.txt

@@ -0,0 +1,53 @@
+include_directories(${PROTOBUF_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
+include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader)
+include_directories(${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader)
+include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_BINARY_DIR}/src)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
+
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+
+set(SOURCES
+  main.cpp
+  tagreaderworker.cpp
+)
+
+qt5_wrap_cpp(MOC ${HEADERS})
+qt5_add_resources(QRC data/data.qrc)
+
+add_executable(strawberry-tagreader
+  ${SOURCES}
+  ${MOC}
+  ${QRC}
+)
+
+target_link_libraries(strawberry-tagreader
+  ${TAGLIB_LIBRARIES}
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTNETWORK_LIBRARY}
+  libstrawberry-common
+  libstrawberry-tagreader
+)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  target_link_libraries(strawberry-tagreader
+    execinfo
+  )
+endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+
+if(APPLE)
+  target_link_libraries(strawberry-tagreader
+    /System/Library/Frameworks/Foundation.framework
+  )
+endif(APPLE)
+
+if(NOT APPLE)
+  # macdeploy.py takes care of this on mac
+  install(TARGETS strawberry-tagreader
+          RUNTIME DESTINATION bin
+  )
+endif(NOT APPLE)

ext/strawberry-tagreader/data/data.qrc

@@ -0,0 +1,5 @@
+<RCC>
+  <qresource prefix="/certs">
+    <file>godaddy-root.pem</file>
+  </qresource>
+</RCC>

ext/strawberry-tagreader/data/godaddy-root.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----

ext/strawberry-tagreader/main.cpp

@@ -0,0 +1,62 @@
+/* This file is part of Strawberry.
+   Copyright 2011, David Sansome <me@davidsansome.com>
+
+   Strawberry 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 3 of the License, or
+   (at your option) any later version.
+
+   Strawberry 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 Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "tagreaderworker.h"
+#include "core/logging.h"
+
+#include <QCoreApplication>
+#include <QLocalSocket>
+#include <QSslSocket>
+#include <QStringList>
+
+#include <iostream>
+#include <sys/time.h>
+
+int main(int argc, char **argv) {
+
+  QCoreApplication a(argc, argv);
+  QStringList args(a.arguments());
+
+  if (args.count() != 2) {
+    std::cerr << "This program is used internally by Strawberry to parse tags in music files\n"
+                 "without exposing the whole application to crashes caused by malformed\n"
+                 "files.  It is not meant to be run on its own.\n";
+    return 1;
+  }
+
+  // Seed random number generator
+  timeval time;
+  gettimeofday(&time, nullptr);
+  qsrand((time.tv_sec * 1000) + (time.tv_usec / 1000));
+
+  logging::Init();
+  qLog(Info) << "TagReader worker connecting to" << args[1];
+
+  // Connect to the parent process.
+  QLocalSocket socket;
+  socket.connectToServer(args[1]);
+  if (!socket.waitForConnected(2000)) {
+    std::cerr << "Failed to connect to the parent process.\n";
+    return 1;
+  }
+
+  QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath(":/certs/godaddy-root.pem", QSsl::Pem));
+
+  TagReaderWorker worker(&socket);
+
+  return a.exec();
+}

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -0,0 +1,68 @@
+/* This file is part of Strawberry.
+   Copyright 2011, David Sansome <me@davidsansome.com>
+
+   Strawberry 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 3 of the License, or
+   (at your option) any later version.
+
+   Strawberry 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 Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "tagreaderworker.h"
+
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QFileInfo>
+#include <QNetworkAccessManager>
+#include <QTextCodec>
+#include <QUrl>
+
+
+TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
+  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
+{
+}
+
+void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
+
+  pb::tagreader::Message reply;
+
+#if 0
+  // Crash every few requests
+  if (qrand() % 10 == 0) {
+    qLog(Debug) << "Crashing on request ID" << message.id();
+    abort();
+  }
+#endif
+
+  if (message.has_read_file_request()) {
+    tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
+  }
+  else if (message.has_save_file_request()) {
+    reply.mutable_save_file_response()->set_success(tag_reader_.SaveFile(QStringFromStdString(message.save_file_request().filename()), message.save_file_request().metadata()));
+  }
+
+  else if (message.has_is_media_file_request()) {
+    reply.mutable_is_media_file_response()->set_success(tag_reader_.IsMediaFile(QStringFromStdString(message.is_media_file_request().filename())));
+  }
+  else if (message.has_load_embedded_art_request()) {
+    QByteArray data = tag_reader_.LoadEmbeddedArt(QStringFromStdString(message.load_embedded_art_request().filename()));
+    reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
+  }
+
+  SendReply(message, &reply);
+}
+
+
+void TagReaderWorker::DeviceClosed() {
+  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
+
+  qApp->exit();
+}

ext/strawberry-tagreader/tagreaderworker.h

@@ -0,0 +1,38 @@
+/* This file is part of Strawberry.
+   Copyright 2011, David Sansome <me@davidsansome.com>
+
+   Strawberry 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 3 of the License, or
+   (at your option) any later version.
+
+   Strawberry 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 Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef TAGREADERWORKER_H
+#define TAGREADERWORKER_H
+
+#include "config.h"
+#include "tagreader.h"
+#include "tagreadermessages.pb.h"
+#include "core/messagehandler.h"
+
+class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
+public:
+  TagReaderWorker(QIODevice *socket, QObject *parent = NULL);
+
+protected:
+  void MessageArrived(const pb::tagreader::Message &message);
+  void DeviceClosed();
+
+private:
+  TagReader tag_reader_;
+};
+
+#endif // TAGREADERWORKER_H