From: APTX Date: Tue, 19 Mar 2013 19:00:37 +0000 (+0100) Subject: Move the database classes to their own file. X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=1c996c21a948a9b1441d3fb051b39c24ea19cff2;p=localmylist.git Move the database classes to their own file. --- diff --git a/localmylist/database.cpp b/localmylist/database.cpp index 8fbdf29..20f9a2e 100644 --- a/localmylist/database.cpp +++ b/localmylist/database.cpp @@ -11,123 +11,6 @@ namespace LocalMyList { -AnimeTitle::AnimeTitle(int aid, TitleType type, const QString &language, const QString &title) -{ - this->aid = aid; - this->type = type; - this->language = language; - this->title = title; -} - -Anime::Anime() -{ - aid = 0; - totalEpisodeCount = 0; - highestEpno = 0; - rating = 0; - votes = 0; - tempRating = 0; - tempVotes = 0; - myVote = 0; - myTempVote = 0; - description = ""; -} - -Episode::Episode() -{ - eid = 0; - aid = 0; - epno = 0; - length = 0; - state = 0; - type = ""; - recap = false; - rating = 0; - votes = 0; - myVote = 0; -} - -File::File() -{ - fid = 0; - eid = 0; - aid = 0; - gid = 0; - size = 0; - length = 0; - version = 1; - censored = false; - qualityId = 0; - myState = 0; - myFileState = 0; -} - -FileLocation::FileLocation() -{ - locationId = 0; - fid = 0; - hostId = 0; - failedRename = false; -} - -FileEpisodeRel::FileEpisodeRel() -{ - fid = 0; - eid = 0; - startPercent = 0; - endPercent = 0; -} - -UnknownFile::UnknownFile() -{ - size = 0; - hostId = 0; -} - - -PendingRequest::PendingRequest() -{ - aid = 0; - eid = 0; - fid = 0; - size = 0; -} - -PendingMyListUpdate::PendingMyListUpdate() -{ - fid = 0; - myState = 0; - myFileState = 0; - setMyWatched = false; - setMyState = false; - setMyFileState = false; - setMyStorage = false; - setMySource = false; - setMyOther = false; -} - -HostInfo::HostInfo() -{ - id = 0; - isUdpHost = false; -} - -OpenFileData::OpenFileData() -{ - fid = 0; - epno = 0; -} - -Report::Report() -{ - reportId = 0; -} - -DatabaseConnectionSettings::DatabaseConnectionSettings() -{ - port = 0; -} - struct DatabaseInternal { QSqlDatabase db; diff --git a/localmylist/database.h b/localmylist/database.h index a761e64..5d70ed1 100644 --- a/localmylist/database.h +++ b/localmylist/database.h @@ -8,224 +8,9 @@ #include #include -namespace LocalMyList { - -struct LOCALMYLISTSHARED_EXPORT AnimeTitle -{ - enum TitleType { - PrimaryTitle = 1, - Synonym = 2, - ShortTitle = 3, - OfficialTitle = 4 - }; - - int aid; - TitleType type; - QString language; - QString title; - - AnimeTitle(int aid = 0, TitleType type = PrimaryTitle, const QString &language = QString(), const QString &title = QString()); -}; - -struct LOCALMYLISTSHARED_EXPORT Anime -{ - int aid; - QDateTime entryAdded; - QDateTime anidbUpdate; - QDateTime entryUpdate; - QDateTime myUpdate; - QString titleEnglish; - QString titleRomaji; - QString titleKanji; - QString description; - QString year; - QDateTime startDate; - QDateTime endDate; - QString type; - int totalEpisodeCount; - int highestEpno; - double rating; - int votes; - double tempRating; - int tempVotes; - double myVote; - QDateTime myVoteDate; - double myTempVote; - QDateTime myTempVoteDate; - - Anime(); -}; - -struct LOCALMYLISTSHARED_EXPORT Episode -{ - int eid; - int aid; - QDateTime entryAdded; - QDateTime anidbUpdate; - QDateTime entryUpdate; - QDateTime myUpdate; - int epno; - QString titleEnglish; - QString titleRomaji; - QString titleKanji; - int length; - QDateTime airdate; - int state; - QString type; - bool recap; - double rating; - int votes; - double myVote; - QDateTime myVoteDate; - - Episode(); -}; - -struct LOCALMYLISTSHARED_EXPORT File -{ - int fid; - int eid; - int aid; - int gid; - QDateTime entryAdded; - QDateTime anidbUpdate; - QDateTime entryUpdate; - QDateTime myUpdate; - QByteArray ed2k; - qint64 size; - int length; - QString extension; - QString groupName; - QString groupNameShort; - QString crc; - QDateTime releaseDate; - int version; - bool censored; - QString source; - int qualityId; - QString quality; - QString resolution; - QString videoCodec; - QString audioCodec; - QString audioLanguage; - QString subtitleLanguage; - QString aspectRatio; - QDateTime myWatched; - int myState; - int myFileState; - QString myStorage; - QString mySource; - QString myOther; - - File(); -}; - -struct LOCALMYLISTSHARED_EXPORT FileLocation -{ - int locationId; - int fid; - int hostId; - QString path; - QDateTime renamed; - bool failedRename; - - FileLocation(); -}; - -struct LOCALMYLISTSHARED_EXPORT UnknownFile -{ - QByteArray ed2k; - qint64 size; - int hostId; - QString path; - - UnknownFile(); -}; - -struct LOCALMYLISTSHARED_EXPORT FileEpisodeRel -{ - int fid; - int eid; - int startPercent; - int endPercent; - - FileEpisodeRel(); -}; +#include "databaseclasses.h" -struct LOCALMYLISTSHARED_EXPORT PendingRequest -{ - int aid; - int eid; - int fid; - QByteArray ed2k; - qint64 size; - - PendingRequest(); -}; - -struct LOCALMYLISTSHARED_EXPORT PendingMyListUpdate -{ - qint64 updateId; - int fid; - bool setMyWatched; - QDateTime myWatched; - bool setMyState; - int myState; - bool setMyFileState; - int myFileState; - bool setMyStorage; - QString myStorage; - bool setMySource; - QString mySource; - bool setMyOther; - QString myOther; - - QDateTime added; - QDateTime started; - QDateTime finished; - - PendingMyListUpdate(); -}; - -struct LOCALMYLISTSHARED_EXPORT HostInfo -{ - int id; - QString name; - bool isUdpHost; - - HostInfo(); -}; - -struct LOCALMYLISTSHARED_EXPORT OpenFileData -{ - int fid; - QString animeTitle; - QString episodeTitle; - int epno; - QString path; - - OpenFileData(); -}; - -struct LOCALMYLISTSHARED_EXPORT Report -{ - int reportId; - QString name; - QString script; - - Report(); -}; - -struct LOCALMYLISTSHARED_EXPORT DatabaseConnectionSettings -{ - QString host; - quint16 port; - QString user; - QString pass; - QString database; - - DatabaseConnectionSettings(); -}; +namespace LocalMyList { struct DatabaseInternal; @@ -375,53 +160,4 @@ public: Q_DECLARE_METATYPE(LocalMyList::Database*) -Q_DECLARE_METATYPE(LocalMyList::Anime) -Q_DECLARE_METATYPE(LocalMyList::Anime*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::Episode) -Q_DECLARE_METATYPE(LocalMyList::Episode*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::File) -Q_DECLARE_METATYPE(LocalMyList::File*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::FileLocation) -Q_DECLARE_METATYPE(LocalMyList::FileLocation*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::UnknownFile) -Q_DECLARE_METATYPE(LocalMyList::UnknownFile*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::FileEpisodeRel) -Q_DECLARE_METATYPE(LocalMyList::FileEpisodeRel*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::PendingRequest) -Q_DECLARE_METATYPE(LocalMyList::PendingRequest*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::PendingMyListUpdate) -Q_DECLARE_METATYPE(LocalMyList::PendingMyListUpdate*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::HostInfo) -Q_DECLARE_METATYPE(LocalMyList::HostInfo*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::OpenFileData) -Q_DECLARE_METATYPE(LocalMyList::OpenFileData*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::Report) -Q_DECLARE_METATYPE(LocalMyList::Report*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(LocalMyList::DatabaseConnectionSettings) -Q_DECLARE_METATYPE(LocalMyList::DatabaseConnectionSettings*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) - #endif // DATABASE_H diff --git a/localmylist/databaseclasses.cpp b/localmylist/databaseclasses.cpp new file mode 100644 index 0000000..06fe50e --- /dev/null +++ b/localmylist/databaseclasses.cpp @@ -0,0 +1,122 @@ +#include "databaseclasses.h" + +namespace LocalMyList { + +AnimeTitle::AnimeTitle(int aid, TitleType type, const QString &language, const QString &title) +{ + this->aid = aid; + this->type = type; + this->language = language; + this->title = title; +} + +Anime::Anime() +{ + aid = 0; + totalEpisodeCount = 0; + highestEpno = 0; + rating = 0; + votes = 0; + tempRating = 0; + tempVotes = 0; + myVote = 0; + myTempVote = 0; + description = ""; +} + +Episode::Episode() +{ + eid = 0; + aid = 0; + epno = 0; + length = 0; + state = 0; + type = ""; + recap = false; + rating = 0; + votes = 0; + myVote = 0; +} + +File::File() +{ + fid = 0; + eid = 0; + aid = 0; + gid = 0; + size = 0; + length = 0; + version = 1; + censored = false; + qualityId = 0; + myState = 0; + myFileState = 0; +} + +FileLocation::FileLocation() +{ + locationId = 0; + fid = 0; + hostId = 0; + failedRename = false; +} + +FileEpisodeRel::FileEpisodeRel() +{ + fid = 0; + eid = 0; + startPercent = 0; + endPercent = 0; +} + +UnknownFile::UnknownFile() +{ + size = 0; + hostId = 0; +} + + +PendingRequest::PendingRequest() +{ + aid = 0; + eid = 0; + fid = 0; + size = 0; +} + +PendingMyListUpdate::PendingMyListUpdate() +{ + fid = 0; + myState = 0; + myFileState = 0; + setMyWatched = false; + setMyState = false; + setMyFileState = false; + setMyStorage = false; + setMySource = false; + setMyOther = false; +} + +HostInfo::HostInfo() +{ + id = 0; + isUdpHost = false; +} + +OpenFileData::OpenFileData() +{ + fid = 0; + epno = 0; +} + +Report::Report() +{ + reportId = 0; +} + +DatabaseConnectionSettings::DatabaseConnectionSettings() +{ + port = 0; +} + +} // namespace LocalMyList diff --git a/localmylist/databaseclasses.h b/localmylist/databaseclasses.h new file mode 100644 index 0000000..282d031 --- /dev/null +++ b/localmylist/databaseclasses.h @@ -0,0 +1,279 @@ +#ifndef DATABASECLASSES_H +#define DATABASECLASSES_H + +#include "localmylist_global.h" + +#include +#include + +namespace LocalMyList { + +struct LOCALMYLISTSHARED_EXPORT AnimeTitle +{ + enum TitleType { + PrimaryTitle = 1, + Synonym = 2, + ShortTitle = 3, + OfficialTitle = 4 + }; + + int aid; + TitleType type; + QString language; + QString title; + + AnimeTitle(int aid = 0, TitleType type = PrimaryTitle, const QString &language = QString(), const QString &title = QString()); +}; + +struct LOCALMYLISTSHARED_EXPORT Anime +{ + int aid; + QDateTime entryAdded; + QDateTime anidbUpdate; + QDateTime entryUpdate; + QDateTime myUpdate; + QString titleEnglish; + QString titleRomaji; + QString titleKanji; + QString description; + QString year; + QDateTime startDate; + QDateTime endDate; + QString type; + int totalEpisodeCount; + int highestEpno; + double rating; + int votes; + double tempRating; + int tempVotes; + double myVote; + QDateTime myVoteDate; + double myTempVote; + QDateTime myTempVoteDate; + + Anime(); +}; + +struct LOCALMYLISTSHARED_EXPORT Episode +{ + int eid; + int aid; + QDateTime entryAdded; + QDateTime anidbUpdate; + QDateTime entryUpdate; + QDateTime myUpdate; + int epno; + QString titleEnglish; + QString titleRomaji; + QString titleKanji; + int length; + QDateTime airdate; + int state; + QString type; + bool recap; + double rating; + int votes; + double myVote; + QDateTime myVoteDate; + + Episode(); +}; + +struct LOCALMYLISTSHARED_EXPORT File +{ + int fid; + int eid; + int aid; + int gid; + QDateTime entryAdded; + QDateTime anidbUpdate; + QDateTime entryUpdate; + QDateTime myUpdate; + QByteArray ed2k; + qint64 size; + int length; + QString extension; + QString groupName; + QString groupNameShort; + QString crc; + QDateTime releaseDate; + int version; + bool censored; + QString source; + int qualityId; + QString quality; + QString resolution; + QString videoCodec; + QString audioCodec; + QString audioLanguage; + QString subtitleLanguage; + QString aspectRatio; + QDateTime myWatched; + int myState; + int myFileState; + QString myStorage; + QString mySource; + QString myOther; + + File(); +}; + +struct LOCALMYLISTSHARED_EXPORT FileLocation +{ + int locationId; + int fid; + int hostId; + QString path; + QDateTime renamed; + bool failedRename; + + FileLocation(); +}; + +struct LOCALMYLISTSHARED_EXPORT UnknownFile +{ + QByteArray ed2k; + qint64 size; + int hostId; + QString path; + + UnknownFile(); +}; + +struct LOCALMYLISTSHARED_EXPORT FileEpisodeRel +{ + int fid; + int eid; + int startPercent; + int endPercent; + + FileEpisodeRel(); +}; + +struct LOCALMYLISTSHARED_EXPORT PendingRequest +{ + int aid; + int eid; + int fid; + QByteArray ed2k; + qint64 size; + + PendingRequest(); +}; + +struct LOCALMYLISTSHARED_EXPORT PendingMyListUpdate +{ + qint64 updateId; + int fid; + bool setMyWatched; + QDateTime myWatched; + bool setMyState; + int myState; + bool setMyFileState; + int myFileState; + bool setMyStorage; + QString myStorage; + bool setMySource; + QString mySource; + bool setMyOther; + QString myOther; + + QDateTime added; + QDateTime started; + QDateTime finished; + + PendingMyListUpdate(); +}; + +struct LOCALMYLISTSHARED_EXPORT HostInfo +{ + int id; + QString name; + bool isUdpHost; + + HostInfo(); +}; + +struct LOCALMYLISTSHARED_EXPORT OpenFileData +{ + int fid; + QString animeTitle; + QString episodeTitle; + int epno; + QString path; + + OpenFileData(); +}; + +struct LOCALMYLISTSHARED_EXPORT Report +{ + int reportId; + QString name; + QString script; + + Report(); +}; + +struct LOCALMYLISTSHARED_EXPORT DatabaseConnectionSettings +{ + QString host; + quint16 port; + QString user; + QString pass; + QString database; + + DatabaseConnectionSettings(); +}; + +} // namespace LocalMyList + +Q_DECLARE_METATYPE(LocalMyList::Anime) +Q_DECLARE_METATYPE(LocalMyList::Anime*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::Episode) +Q_DECLARE_METATYPE(LocalMyList::Episode*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::File) +Q_DECLARE_METATYPE(LocalMyList::File*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::FileLocation) +Q_DECLARE_METATYPE(LocalMyList::FileLocation*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::UnknownFile) +Q_DECLARE_METATYPE(LocalMyList::UnknownFile*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::FileEpisodeRel) +Q_DECLARE_METATYPE(LocalMyList::FileEpisodeRel*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::PendingRequest) +Q_DECLARE_METATYPE(LocalMyList::PendingRequest*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::PendingMyListUpdate) +Q_DECLARE_METATYPE(LocalMyList::PendingMyListUpdate*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::HostInfo) +Q_DECLARE_METATYPE(LocalMyList::HostInfo*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::OpenFileData) +Q_DECLARE_METATYPE(LocalMyList::OpenFileData*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::Report) +Q_DECLARE_METATYPE(LocalMyList::Report*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(LocalMyList::DatabaseConnectionSettings) +Q_DECLARE_METATYPE(LocalMyList::DatabaseConnectionSettings*) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) + +#endif // DATABASECLASSES_H diff --git a/localmylist/localmylist.pro b/localmylist/localmylist.pro index e76a2fc..b3578ad 100644 --- a/localmylist/localmylist.pro +++ b/localmylist/localmylist.pro @@ -25,7 +25,8 @@ SOURCES += \ directorywatcher.cpp \ addrelatedepisodestask.cpp \ scriptablesql.cpp \ - reportengine.cpp + reportengine.cpp \ + databaseclasses.cpp HEADERS += \ localmylist_global.h \ @@ -44,7 +45,8 @@ HEADERS += \ directorywatcher.h \ addrelatedepisodestask.h \ scriptablesql.h \ - reportengine.h + reportengine.h \ + databaseclasses.h CONV_HEADERS += \ include/LocalMyList/AbstractTask \