From: APTX Date: Mon, 23 Jul 2012 17:27:54 +0000 (+0200) Subject: Rename File::type to File::source X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=0e30f74441fcb6b3b607a12328dd153e10e84e03;p=localmylist.git Rename File::type to File::source --- diff --git a/localmylist/database.cpp b/localmylist/database.cpp index 5ebfd90..a159cf9 100644 --- a/localmylist/database.cpp +++ b/localmylist/database.cpp @@ -723,7 +723,7 @@ bool Database::setFile(const File &file) " ed2k = :ed2k, size = :size, length = :length, extension = :extension, " " group_name = :groupName, group_name_short = :groupNameShort, crc = :crc, " " release_date = :releaseDate, version = :version, censored = :censored, " - " type = :type, quality_id = :qualityId, quality = :quality, " + " source = :source, quality_id = :qualityId, quality = :quality, " " resolution = :resolution, video_codec = :videoCodec, " " audio_codec = :audioCodec, audio_language = :audioLanguage, " " subtitle_language = :subtitleLanguage, aspect_ratio = :aspectRatio, " @@ -748,7 +748,7 @@ bool Database::setFile(const File &file) q.bindValue(":releaseDate", file.releaseDate); q.bindValue(":version", file.version); q.bindValue(":censored", file.censored); - q.bindValue(":type", file.type); + q.bindValue(":source", file.source); q.bindValue(":qualityId", file.qualityId); q.bindValue(":quality", file.quality); q.bindValue(":resolution", file.resolution); @@ -848,7 +848,7 @@ bool Database::addFile(const File &file) QSqlQuery &q = prepare( "INSERT INTO file VALUES(:fid, :eid, :aid, :gid, :anidbUpdate, :entryUpdate, :myUpdate, " " :ed2k, :size, :length, :extension, :groupName, :groupNameShort, " - " :crc, :releaseDate, :version, :censored, :type, :qualityId, " + " :crc, :releaseDate, :version, :censored, :source, :qualityId, " " :quality, :resolution, :vidoeCodec, :audioCodec, :audioLanguage, " " :subtitleLanguage, :aspectRatio, :myWatched, :myState, " " :myFileState, :myStorage, :mySource, :myOther) "); @@ -870,7 +870,7 @@ bool Database::addFile(const File &file) q.bindValue(":releaseDate", file.releaseDate); q.bindValue(":version", file.version); q.bindValue(":censored", file.censored); - q.bindValue(":type", file.type); + q.bindValue(":source", file.source); q.bindValue(":qualityId", file.qualityId); q.bindValue(":quality", file.quality); q.bindValue(":resolution", file.resolution); @@ -1401,7 +1401,7 @@ File Database::readFile(QSqlQuery &q) f.releaseDate = q.value(14).toDateTime(); f.version = q.value(15).toInt(); f.censored = q.value(16).toBool(); - f.type = q.value(17).toString(); + f.source = q.value(17).toString(); f.qualityId = q.value(18).toInt(); f.quality = q.value(19).toString(); f.resolution = q.value(20).toString(); diff --git a/localmylist/database.h b/localmylist/database.h index d038ea1..43ba781 100644 --- a/localmylist/database.h +++ b/localmylist/database.h @@ -98,7 +98,7 @@ struct LOCALMYLISTSHARED_EXPORT File QDateTime releaseDate; int version; bool censored; - QString type; // TODO rename this to source + QString source; int qualityId; QString quality; QString resolution; diff --git a/localmylist/mylistexportparsetask.cpp b/localmylist/mylistexportparsetask.cpp index a0c7e33..e17478f 100644 --- a/localmylist/mylistexportparsetask.cpp +++ b/localmylist/mylistexportparsetask.cpp @@ -486,7 +486,7 @@ void MyListExportParseTask::readFile() } // f.censored; else if (name() == "TypeName") { - f.type = readElementText(); + f.source = readElementText(); } else if (name() == "QualityID") { f.qualityId = readElementText().toInt(); @@ -592,8 +592,8 @@ qDebug() << "Updating File" << current.fid; current.version = f.version; if (f.censored) current.censored = f.censored; - if (!f.type.isEmpty()) - current.type = f.type; + if (!f.source.isEmpty()) + current.source = f.source; if (f.qualityId) current.qualityId = f.qualityId; if (!f.quality.isEmpty()) diff --git a/localmylist/requesthandler.cpp b/localmylist/requesthandler.cpp index 9e5723c..2c34ea9 100644 --- a/localmylist/requesthandler.cpp +++ b/localmylist/requesthandler.cpp @@ -302,7 +302,7 @@ void RequestHandler::fileRequestComplete(bool success) //next.releaseDate next.version = reply->version(); next.censored = reply->isCensored(); - next.type = reply->source(); // TODO This is called source on AniDB + next.source = reply->source(); // next.qualityId - can map quality to qualityId next.quality = reply->quality(); next.resolution = reply->videoResolution(); diff --git a/localmylist/scriptable.cpp b/localmylist/scriptable.cpp index 199caa7..15a49e6 100644 --- a/localmylist/scriptable.cpp +++ b/localmylist/scriptable.cpp @@ -1062,18 +1062,18 @@ void File::write_censored(bool val) o->censored = val; } -QString File::read_type() const +QString File::read_source() const { auto o = thisObj(); if (!o) return QString(); - return o->type; + return o->source; } -void File::write_type(QString val) +void File::write_source(QString val) { auto o = thisObj(); if (!o) return; - o->type = val; + o->source = val; } int File::read_qualityId() const diff --git a/localmylist/scriptable.h b/localmylist/scriptable.h index c92ab6a..e32ab67 100644 --- a/localmylist/scriptable.h +++ b/localmylist/scriptable.h @@ -261,7 +261,7 @@ class LOCALMYLISTSHARED_EXPORT File : public QObject, protected QScriptable Q_PROPERTY(QDateTime releaseDate READ read_releaseDate WRITE write_releaseDate) Q_PROPERTY(int version READ read_version WRITE write_version) Q_PROPERTY(bool censored READ read_censored WRITE write_censored) - Q_PROPERTY(QString type READ read_type WRITE write_type) + Q_PROPERTY(QString source READ read_source WRITE write_source) Q_PROPERTY(int qualityId READ read_qualityId WRITE write_qualityId) Q_PROPERTY(QString quality READ read_quality WRITE write_quality) Q_PROPERTY(QString resolution READ read_resolution WRITE write_resolution) @@ -336,8 +336,8 @@ public: bool read_censored() const; void write_censored(bool val); - QString read_type() const; - void write_type(QString val); + QString read_source() const; + void write_source(QString val); int read_qualityId() const; void write_qualityId(int val); diff --git a/localmylist/share/schema/schema.sql b/localmylist/share/schema/schema.sql index a5f0211..b53d27b 100644 --- a/localmylist/share/schema/schema.sql +++ b/localmylist/share/schema/schema.sql @@ -80,7 +80,7 @@ CREATE TABLE file ( release_date timestamp without time zone, version integer, censored boolean, - type character varying(50), + source character varying(50), quality_id integer, quality character varying(50), resolution character varying(50),