From 193cf1c75017dcbf7bbd2fca7be5b5a934948af4 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 20 Feb 2021 17:06:55 +0100 Subject: [PATCH] Rename protobuf namespace Fixes #654 --- ext/libstrawberry-tagreader/tagreader.cpp | 48 +++++++++---------- ext/libstrawberry-tagreader/tagreader.h | 14 +++--- .../tagreadermessages.proto | 2 +- ext/strawberry-tagreader/tagreaderworker.cpp | 8 ++-- ext/strawberry-tagreader/tagreaderworker.h | 4 +- src/core/song.cpp | 6 +-- src/core/song.h | 8 ++-- src/core/tagreaderclient.cpp | 20 ++++---- src/core/tagreaderclient.h | 4 +- tests/src/tagreader_test.cpp | 4 +- 10 files changed, 59 insertions(+), 59 deletions(-) diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp index 52cab04ba..0a6a56bac 100644 --- a/ext/libstrawberry-tagreader/tagreader.cpp +++ b/ext/libstrawberry-tagreader/tagreader.cpp @@ -146,34 +146,34 @@ bool TagReader::IsMediaFile(const QString &filename) const { } -pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const { +spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const { - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO; - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE; #ifdef HAVE_TAGLIB_DSFFILE - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF; #endif #ifdef HAVE_TAGLIB_DSDIFFFILE - if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF; + if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF; #endif - return pb::tagreader::SongMetadata_FileType_UNKNOWN; + return spb::tagreader::SongMetadata_FileType_UNKNOWN; } -void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const { +void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const { const QByteArray url(QUrl::fromLocalFile(filename).toEncoded()); const QFileInfo info(filename); @@ -435,7 +435,7 @@ void TagReader::Decode(const QString &tag, std::string *output) { } -void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const { +void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const { if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer()); if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer()); @@ -460,7 +460,7 @@ void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, } -void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const { +void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const { TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST"); if (it != map.end()) { @@ -504,7 +504,7 @@ void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, } -void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const { +void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const { vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true); vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true); @@ -522,7 +522,7 @@ void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, con } -bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const { +bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const { if (filename.isEmpty()) return false; @@ -603,7 +603,7 @@ bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetad return result; } -void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const { +void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const { tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str()))); tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true); diff --git a/ext/libstrawberry-tagreader/tagreader.h b/ext/libstrawberry-tagreader/tagreader.h index 8fe998c90..b69c495ae 100644 --- a/ext/libstrawberry-tagreader/tagreader.h +++ b/ext/libstrawberry-tagreader/tagreader.h @@ -51,10 +51,10 @@ class TagReader { ~TagReader(); bool IsMediaFile(const QString &filename) const; - pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const; + spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const; - void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const; - bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const; + void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const; + bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const; QByteArray LoadEmbeddedArt(const QString &filename) const; QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const; @@ -63,11 +63,11 @@ class TagReader { static void Decode(const TagLib::String &tag, std::string *output); static void Decode(const QString &tag, std::string *output); - void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const; - void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const; + void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const; + void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const; - void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const; - void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const; + void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const; + void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const; void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const; void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const; diff --git a/ext/libstrawberry-tagreader/tagreadermessages.proto b/ext/libstrawberry-tagreader/tagreadermessages.proto index 5b05a9b7b..be098f775 100644 --- a/ext/libstrawberry-tagreader/tagreadermessages.proto +++ b/ext/libstrawberry-tagreader/tagreadermessages.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -package pb.tagreader; +package spb.tagreader; message SongMetadata { diff --git a/ext/strawberry-tagreader/tagreaderworker.cpp b/ext/strawberry-tagreader/tagreaderworker.cpp index b27dbdb73..66646caf8 100644 --- a/ext/strawberry-tagreader/tagreaderworker.cpp +++ b/ext/strawberry-tagreader/tagreaderworker.cpp @@ -27,11 +27,11 @@ #include "tagreaderworker.h" TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent) - : AbstractMessageHandler(socket, parent) {} + : AbstractMessageHandler(socket, parent) {} -void TagReaderWorker::MessageArrived(const pb::tagreader::Message &message) { +void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) { - pb::tagreader::Message reply; + spb::tagreader::Message reply; if (message.has_read_file_request()) { tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata()); @@ -56,7 +56,7 @@ void TagReaderWorker::MessageArrived(const pb::tagreader::Message &message) { } void TagReaderWorker::DeviceClosed() { - AbstractMessageHandler::DeviceClosed(); + AbstractMessageHandler::DeviceClosed(); qApp->exit(); } diff --git a/ext/strawberry-tagreader/tagreaderworker.h b/ext/strawberry-tagreader/tagreaderworker.h index 1e75b0ff9..f70cf426b 100644 --- a/ext/strawberry-tagreader/tagreaderworker.h +++ b/ext/strawberry-tagreader/tagreaderworker.h @@ -28,12 +28,12 @@ class QIODevice; -class TagReaderWorker : public AbstractMessageHandler { +class TagReaderWorker : public AbstractMessageHandler { public: explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr); protected: - void MessageArrived(const pb::tagreader::Message &message) override; + void MessageArrived(const spb::tagreader::Message &message) override; void DeviceClosed() override; private: diff --git a/src/core/song.cpp b/src/core/song.cpp index 33d743a8b..40e42dd97 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -744,7 +744,7 @@ void Song::set_genre_id3(int id) { set_genre(TStringToQString(TagLib::ID3v1::genre(id))); } -void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) { +void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) { if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile; @@ -791,7 +791,7 @@ void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) { } -void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const { +void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const { const QByteArray url(d->url_.toEncoded()); const QByteArray art_automatic(d->art_automatic_.toEncoded()); @@ -826,7 +826,7 @@ void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const { pb->set_filesize(d->filesize_); pb->set_suspicious_tags(d->suspicious_tags_); pb->set_art_automatic(art_automatic.constData(), art_automatic.size()); - pb->set_filetype(static_cast(d->filetype_)); + pb->set_filetype(static_cast(d->filetype_)); } diff --git a/src/core/song.h b/src/core/song.h index 418e7750b..0044f10e3 100644 --- a/src/core/song.h +++ b/src/core/song.h @@ -44,11 +44,11 @@ namespace Engine { struct SimpleMetaBundle; } // namespace Engine -namespace pb { +namespace spb { namespace tagreader { class SongMetadata; } // namespace tagreader -} // namespace pb +} // namespace spb #ifdef HAVE_LIBGPOD struct _Itdb_Track; @@ -155,7 +155,7 @@ class Song { // Constructors void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec); void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end); - void InitFromProtobuf(const pb::tagreader::SongMetadata &pb); + void InitFromProtobuf(const spb::tagreader::SongMetadata &pb); void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0); void InitFromFilePartial(const QString &filename); // Just store the filename: incomplete but fast void InitArtManual(); // Check if there is already a art in the cache and store the filename in art_manual @@ -180,7 +180,7 @@ class Song { void BindToQuery(QSqlQuery *query) const; void BindToFtsQuery(QSqlQuery *query) const; void ToXesam(QVariantMap *map) const; - void ToProtobuf(pb::tagreader::SongMetadata *pb) const; + void ToProtobuf(spb::tagreader::SongMetadata *pb) const; // Simple accessors bool is_valid() const; diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp index 9d33661e4..51a3a5313 100644 --- a/src/core/tagreaderclient.cpp +++ b/src/core/tagreaderclient.cpp @@ -71,8 +71,8 @@ void TagReaderClient::WorkerFailedToStart() { TagReaderReply *TagReaderClient::ReadFile(const QString &filename) { - pb::tagreader::Message message; - pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request(); + spb::tagreader::Message message; + spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request(); req->set_filename(DataCommaSizeFromQString(filename)); @@ -82,8 +82,8 @@ TagReaderReply *TagReaderClient::ReadFile(const QString &filename) { TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) { - pb::tagreader::Message message; - pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request(); + spb::tagreader::Message message; + spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request(); req->set_filename(DataCommaSizeFromQString(filename)); metadata.ToProtobuf(req->mutable_metadata()); @@ -96,8 +96,8 @@ TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &m TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) { - pb::tagreader::Message message; - pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request(); + spb::tagreader::Message message; + spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request(); req->set_filename(DataCommaSizeFromQString(filename)); @@ -107,8 +107,8 @@ TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) { TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) { - pb::tagreader::Message message; - pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request(); + spb::tagreader::Message message; + spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request(); req->set_filename(DataCommaSizeFromQString(filename)); @@ -118,8 +118,8 @@ TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) { TagReaderReply *TagReaderClient::SaveEmbeddedArt(const QString &filename, const QByteArray &data) { - pb::tagreader::Message message; - pb::tagreader::SaveEmbeddedArtRequest *req = message.mutable_save_embedded_art_request(); + spb::tagreader::Message message; + spb::tagreader::SaveEmbeddedArtRequest *req = message.mutable_save_embedded_art_request(); req->set_filename(DataCommaSizeFromQString(filename)); req->set_data(data.constData(), data.size()); diff --git a/src/core/tagreaderclient.h b/src/core/tagreaderclient.h index a0229a96a..7feefdd56 100644 --- a/src/core/tagreaderclient.h +++ b/src/core/tagreaderclient.h @@ -44,7 +44,7 @@ class TagReaderClient : public QObject { public: explicit TagReaderClient(QObject *parent = nullptr); - typedef AbstractMessageHandler HandlerType; + typedef AbstractMessageHandler HandlerType; typedef HandlerType::ReplyType ReplyType; static const char *kWorkerExecutableName; @@ -80,7 +80,7 @@ class TagReaderClient : public QObject { static TagReaderClient *sInstance; WorkerPool *worker_pool_; - QList message_queue_; + QList message_queue_; QThread *original_thread_; }; diff --git a/tests/src/tagreader_test.cpp b/tests/src/tagreader_test.cpp index f3d30c1be..5cc37aa5c 100644 --- a/tests/src/tagreader_test.cpp +++ b/tests/src/tagreader_test.cpp @@ -44,7 +44,7 @@ class TagReaderTest : public ::testing::Test { static Song ReadSongFromFile(const QString& filename) { TagReader tag_reader; Song song; - ::pb::tagreader::SongMetadata pb_song; + ::spb::tagreader::SongMetadata pb_song; // We need to init protobuf object from a Song object, to have default values initialized correctly. song.ToProtobuf(&pb_song); @@ -55,7 +55,7 @@ class TagReaderTest : public ::testing::Test { static void WriteSongToFile(const Song& song, const QString& filename) { TagReader tag_reader; - ::pb::tagreader::SongMetadata pb_song; + ::spb::tagreader::SongMetadata pb_song; song.ToProtobuf(&pb_song); tag_reader.SaveFile(filename, pb_song); }