medvedych/harbour-nextcloudnotes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Still no big changes

Browse source
This commit is contained in:
Scharel Clemens 2019-06-20 20:13:46 +02:00
parent 52147548cc
commit 1e7203d1a2
4 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qml/components/NotesApi.qml
View file

@ -13,7 +13,7 @@ Item {
property string statusText: "No Content"
onStatusChanged: {
console.log("Network status: " + statusText + " (" + status + ")")
//console.log("Network response: " + statusText + " (" + status + ")")
}
/*function getNote(id) {
@ -62,6 +62,7 @@ Item {
if (apiReq.status === 200) {
response = apiReq.responseText
//console.log(response)
console.log("Network response: " + statusText + " (" + status + ")")
}
else if(apiReq.status === 0) {
statusText = qsTr("Unable to connect")

55
src/notesmodel.cpp
View file

@ -57,7 +57,7 @@ void NotesModel::clearSearch() {
search();
}
bool NotesModel::applyJSON(QString json, bool replaceIfArray) {
bool NotesModel::applyJSON(QString json) {
qDebug() << "Applying new JSON input";// << json;
uint notesModified = 0;
QJsonParseError error;
@ -66,9 +66,6 @@ bool NotesModel::applyJSON(QString json, bool replaceIfArray) {
if (jdoc.isArray()) {
qDebug() << "- It's an array...";
QJsonArray jarr = jdoc.array();
QList<int> notesToRemove;
for (int i = 0; i < m_notes.size(); i++)
notesToRemove << i;
while (!jarr.empty()) {
//qDebug() << jarr.count() << "JSON Objects to handle...";
QJsonValue jval = jarr.first();
@ -81,16 +78,14 @@ bool NotesModel::applyJSON(QString json, bool replaceIfArray) {
if (!note.error()) {
int oldPosition = indexOf(note.id());
Note oldNote = get(oldPosition);
if (oldPosition >= 0 && note.etag() != oldNote.etag() && replaceIfArray) {
removeNote(note.id());
if (oldPosition >= 0 && note.etag() != oldNote.etag()) {
qDebug() << "-- Existing note " << note.title() << "changed, updating the model...";
replaceNote(note);
}
else if (oldPosition < 0) {
qDebug() << "-- New note" << note.title() << ", adding it to the model...";
insertNote(note);
}
else if (oldPosition) { //TODO
}
//qDebug() << "New note" << note.title << "adding it to the notes to add...";
int position = insertPosition(note);
insertNote(note);
//qDebug() << "Adding note"<< note.title << "on position" << position;
//beginInsertRows(QModelIndex(), position, position);
//m_notes.insert(position, note);
@ -128,7 +123,7 @@ bool NotesModel::applyJSON(QString json, bool replaceIfArray) {
if (!jobj.isEmpty() && !jobj.value(roleNames()[ErrorRole]).toBool(true)) {
Note note = Note::fromjson(jobj); // TODO connect signals
int position = indexOf(note.id());
if (position >= 0 && replaceIfArray) {
if (position >= 0) {
m_notes[position].note = note;
}
else {
@ -169,7 +164,20 @@ int NotesModel::insertNote(Note &note) {
return position;
}
bool NotesModel::removeAt(int position){
bool NotesModel::removeNote(Note &note) {
return removeNote(note.id());
}
bool NotesModel::removeNote(int id) {
bool noteRemoved = false;
int position = indexOf(id);
if (position >= 0) {
noteRemoved = removeAt(position);;
}
return noteRemoved;
}
bool NotesModel::removeAt(int position) {
if (position >= 0 && position < m_notes.size()) {
beginRemoveRows(QModelIndex(), position, position);
m_notes.removeAt(position);
@ -179,14 +187,19 @@ bool NotesModel::removeAt(int position){
return false;
}
bool NotesModel::removeNote(int id) {
bool noteRemoved = false;
int position = indexOf(id);
while (position >= 0) {
noteRemoved |= removeAt(position);;
position = indexOf(id);
bool NotesModel::replaceNote(Note &note) {
int position = indexOf(note.id());
if (position >= 0 && position < m_notes.size()) {
ModelNote<Note, bool> modelNote;
modelNote.note = note;
modelNote.param = m_notes[position].param;
m_notes.replace(position, modelNote);
QVector<int> roles;
roles << ModifiedRole << TitleRole << CategoryRole << ContentRole << FavoriteRole << EtagRole;
emit dataChanged(this->index(position), this->index(position), roles);
return true;
}
return noteRemoved;
return false;
}
void NotesModel::clear() {

6
src/notesmodel.h
View file

@ -32,10 +32,12 @@ public:
Q_INVOKABLE void search(QString searchText = QString());
Q_INVOKABLE void clearSearch();
Q_INVOKABLE bool applyJSON(QString json, bool replaceIfArray = true);
Q_INVOKABLE bool applyJSON(QString json);
Q_INVOKABLE int insertNote(Note &note);
Q_INVOKABLE bool removeAt(int position);
Q_INVOKABLE bool removeNote(Note &note);
Q_INVOKABLE bool removeNote(int id);
Q_INVOKABLE bool replaceNote(Note &note);
Q_INVOKABLE bool removeAt(int position);
Q_INVOKABLE void clear();
Q_INVOKABLE int indexOf(int id) const;

2
translations/harbour-nextcloudnotes.ts
View file

@ -285,7 +285,7 @@
<context>
<name>NotesApi</name>
<message>
<location filename="../qml/components/NotesApi.qml" line="67"/>
<location filename="../qml/components/NotesApi.qml" line="68"/>
<source>Unable to connect</source>
<translation type="unfinished"></translation>
</message>