1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00

Merge branch 'master' of github.com:laurent22/joplin

This commit is contained in:
Laurent Cozic
2017-02-06 20:23:37 +00:00
6 changed files with 127 additions and 32 deletions

View File

@ -27,6 +27,49 @@ int Folder::noteCount() const {
return q.value(0).toInt();
}
std::unique_ptr<Folder> Folder::root() {
std::unique_ptr<Folder> folder(new Folder());
return std::move(folder);
}
std::vector<std::unique_ptr<BaseModel>> Folder::children(const QString &orderBy, int limit, int offset) const {
std::vector<std::unique_ptr<BaseModel>> output;
std::vector<jop::Table> tables;
tables.push_back(jop::FoldersTable);
tables.push_back(jop::NotesTable);
for (int tableIndex = 0; tableIndex < tables.size(); tableIndex++) {
jop::Table table = tables[tableIndex];
QString sql = QString("SELECT %1 FROM %2 WHERE parent_id = :parent_id ORDER BY %3 %4 %5")
.arg(BaseModel::sqlTableFields(table))
.arg(BaseModel::tableName(table))
.arg(orderBy)
.arg(limit ? QString("LIMIT %1").arg(limit) : "")
.arg(limit && offset ? QString("OFFSET %1").arg(offset) : "");
QSqlQuery q = jop::db().prepare(sql);
q.bindValue(":parent_id", idString());
jop::db().execQuery(q);
if (!jop::db().errorCheck(q)) return output;
while (q.next()) {
if (table == jop::FoldersTable) {
std::unique_ptr<BaseModel> folder(new Folder());
folder->loadSqlQuery(q);
output.push_back(std::move(folder));
} else if (table == jop::NotesTable) {
std::unique_ptr<BaseModel> note(new Note());
note->loadSqlQuery(q);
output.push_back(std::move(note));
}
}
}
return output;
}
std::vector<std::unique_ptr<Note>> Folder::notes(const QString &orderBy, int limit, int offset) const {
std::vector<std::unique_ptr<Note>> output;
@ -49,19 +92,31 @@ std::vector<std::unique_ptr<Note>> Folder::notes(const QString &orderBy, int lim
return output;
}
std::vector<std::unique_ptr<Folder>> Folder::pathToFolders(const QString& path, bool isNotePath) {
std::vector<std::unique_ptr<Folder>> Folder::pathToFolders(const QString& path, bool returnLast, int& errorCode) {
std::vector<std::unique_ptr<Folder>> output;
if (!path.length()) return output;
QStringList parts = path.split('/');
QString parentId = "";
for (int i = 0; i < parts.size(); i++) {
QString parentId("");
int toIndex = returnLast ? parts.size() : parts.size() - 1;
for (int i = 0; i < toIndex; i++) {
std::unique_ptr<Folder> folder(new Folder());
bool ok = folder->loadByField(parentId, "title", parts[i]);
qWarning() << "Folder does not exist" << parts[i];
if (!ok) {
// qWarning() << "Folder does not exist" << parts[i];
errorCode = 1;
return output;
}
output.push_back(std::move(folder));
}
return output;
}
QString Folder::pathBaseName(const QString& path) {
QStringList parts = path.split('/');
return parts[parts.size() - 1];
}
int Folder::noteIndexById(const QString &orderBy, const QString& id) const {
qDebug() << "Folder::noteIndexById" << orderBy << id;
@ -109,4 +164,8 @@ std::vector<std::unique_ptr<Folder>> Folder::all(const QString& parentId, const
return output;
}
QString Folder::displayTitle() const {
return QString("%1/").arg(value("title").toString());
}
}