X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=7be2c7468ec15e8dd650d227547a8de3f4e3af18;hb=658663a586eaf33b59986fa6d0fac93b36d8b5a6;hp=12e53cb6f180236059c7f1026e8eff4eeb258e1e;hpb=e3872d583f324e225580a6fd05568d36e4ba0db0;p=mobile-ledger-staging.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
index 12e53cb6..7be2c746 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.async;
@@ -23,13 +23,13 @@ import android.os.AsyncTask;
import android.os.OperationCanceledException;
import android.util.Log;
-import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerAccount;
import net.ktnx.mobileledger.model.LedgerTransaction;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
import net.ktnx.mobileledger.ui.activity.MainActivity;
+import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel;
import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.NetworkUtil;
@@ -42,37 +42,38 @@ import java.lang.ref.WeakReference;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RetrieveTransactionsTask
- extends AsyncTask {
- public static final int MATCHING_TRANSACTIONS_LIMIT = 50;
- private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+) | ");
- private static final Pattern transactionDescriptionPattern =
+ extends AsyncTask {
+ private static final int MATCHING_TRANSACTIONS_LIMIT = 50;
+ private static final Pattern reComment = Pattern.compile("^\\s*;");
+ private static final Pattern reTransactionStart = Pattern.compile("([\\d.-]+) | ");
+ private static final Pattern reTransactionDescription =
Pattern.compile("
contextRef;
- protected int error;
- Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
- Pattern account_value_re = Pattern.compile(
- "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?");
- Pattern tr_end_re = Pattern.compile("
");
- Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\s*=\\s*new\\b");
- Pattern description_items_re = Pattern.compile("\"value\":\"([^\"]+)\"");
+ private static final Pattern reTransactionDetails =
+ Pattern.compile("^\\s+(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
+ private static final Pattern reEnd = Pattern.compile("\\bid=\"addmodal\"");
+ private WeakReference contextRef;
+ private int error;
// %3A is '='
- private boolean success;
+ private Pattern reAccountName = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+ private Pattern reAccountValue = Pattern.compile(
+ "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?");
public RetrieveTransactionsTask(WeakReference contextRef) {
this.contextRef = contextRef;
}
- private static final void L(String msg) {
- Log.d("transaction-parser", msg);
+ private static void L(String msg) {
+ //Log.d("transaction-parser", msg);
}
@Override
protected void onProgressUpdate(Progress... values) {
@@ -89,32 +90,32 @@ public class RetrieveTransactionsTask
context.onRetrieveStart();
}
@Override
- protected void onPostExecute(Void aVoid) {
- super.onPostExecute(aVoid);
+ protected void onPostExecute(String error) {
+ super.onPostExecute(error);
MainActivity context = getContext();
if (context == null) return;
- context.onRetrieveDone(success);
+ context.onRetrieveDone(error);
}
@Override
protected void onCancelled() {
super.onCancelled();
MainActivity context = getContext();
if (context == null) return;
- context.onRetrieveDone(false);
+ context.onRetrieveDone(null);
}
@SuppressLint("DefaultLocale")
@Override
- protected Void doInBackground(Void... params) {
+ protected String doInBackground(Void... params) {
MobileLedgerProfile profile = Data.profile.get();
Progress progress = new Progress();
int maxTransactionId = Progress.INDETERMINATE;
- success = false;
ArrayList accountList = new ArrayList<>();
- ArrayList transactionList = new ArrayList<>();
+ HashMap accountNames = new HashMap<>();
LedgerAccount lastAccount = null;
+ boolean onlyStarred = Data.optShowOnlyStarred.get();
Data.backgroundTaskCount.incrementAndGet();
try {
- HttpURLConnection http = NetworkUtil.prepare_connection("journal");
+ HttpURLConnection http = NetworkUtil.prepareConnection("journal");
http.setAllowUserInteraction(false);
publishProgress(progress);
MainActivity ctx = getContext();
@@ -125,16 +126,14 @@ public class RetrieveTransactionsTask
String.format("HTTP error %d", http.getResponseCode()));
db.beginTransaction();
try {
- String ledgerTitle = null;
-
db.execSQL("UPDATE transactions set keep=0");
db.execSQL("update account_values set keep=0;");
db.execSQL("update accounts set keep=0;");
ParserState state = ParserState.EXPECTING_ACCOUNT;
String line;
- BufferedReader buf =
- new BufferedReader(new InputStreamReader(resp, "UTF-8"));
+ BufferedReader buf = new BufferedReader(
+ new InputStreamReader(resp, StandardCharsets.UTF_8));
int processedTransactionCount = 0;
int transactionId = 0;
@@ -144,6 +143,12 @@ public class RetrieveTransactionsTask
while ((line = buf.readLine()) != null) {
throwIfCancelled();
Matcher m;
+ m = reComment.matcher(line);
+ if (m.find()) {
+ // TODO: comments are ignored for now
+ Log.v("transaction-parser", "Ignoring comment");
+ continue;
+ }
//L(String.format("State is %d", updating));
switch (state) {
case EXPECTING_ACCOUNT:
@@ -153,16 +158,45 @@ public class RetrieveTransactionsTask
Data.accounts.set(accountList);
continue;
}
- m = account_name_re.matcher(line);
+ m = reAccountName.matcher(line);
if (m.find()) {
String acct_encoded = m.group(1);
String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
acct_name = acct_name.replace("\"", "");
L(String.format("found account: %s", acct_name));
- addAccount(db, acct_name);
- lastAccount = new LedgerAccount(acct_name);
- accountList.add(lastAccount);
+ lastAccount = profile.loadAccount(acct_name);
+ if (lastAccount == null) {
+ lastAccount = new LedgerAccount(acct_name);
+ profile.storeAccount(lastAccount);
+ }
+
+ // make sure the parent account(s) are present,
+ // synthesising them if necessary
+ String parentName = lastAccount.getParentName();
+ if (parentName != null) {
+ Stack toAppend = new Stack<>();
+ while (parentName != null) {
+ if (accountNames.containsKey(parentName)) break;
+ toAppend.push(parentName);
+ parentName = new LedgerAccount(parentName)
+ .getParentName();
+ }
+ while (!toAppend.isEmpty()) {
+ String aName = toAppend.pop();
+ LedgerAccount acc = new LedgerAccount(aName);
+ acc.setHidden(lastAccount.isHidden());
+ if (!onlyStarred || !acc.isHidden())
+ accountList.add(acc);
+ L(String.format("gap-filling with %s", aName));
+ accountNames.put(aName, null);
+ profile.storeAccount(acc);
+ }
+ }
+
+ if (!onlyStarred || !lastAccount.isHidden())
+ accountList.add(lastAccount);
+ accountNames.put(acct_name, null);
state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
L("â expecting account amount");
@@ -170,7 +204,7 @@ public class RetrieveTransactionsTask
break;
case EXPECTING_ACCOUNT_AMOUNT:
- m = account_value_re.matcher(line);
+ m = reAccountValue.matcher(line);
boolean match_found = false;
while (m.find()) {
throwIfCancelled();
@@ -181,11 +215,8 @@ public class RetrieveTransactionsTask
if (currency == null) currency = "";
value = value.replace(',', '.');
L("curr=" + currency + ", value=" + value);
- db.execSQL(
- "insert or replace into account_values(account, currency, value, keep) values(?, ?, ?, 1);",
- new Object[]{lastAccount.getName(), currency,
- Float.valueOf(value)
- });
+ profile.storeAccountValue(lastAccount.getName(), currency,
+ Float.valueOf(value));
lastAccount.addAmount(Float.parseFloat(value), currency);
}
@@ -198,7 +229,7 @@ public class RetrieveTransactionsTask
case EXPECTING_TRANSACTION:
if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
- m = transactionStartPattern.matcher(line);
+ m = reTransactionStart.matcher(line);
if (m.find()) {
transactionId = Integer.valueOf(m.group(1));
state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION;
@@ -213,30 +244,38 @@ public class RetrieveTransactionsTask
progress.setTotal(transactionId);
publishProgress(progress);
}
- m = endPattern.matcher(line);
+ m = reEnd.matcher(line);
if (m.find()) {
L("--- transaction value complete ---");
- success = true;
break LINES;
}
break;
case EXPECTING_TRANSACTION_DESCRIPTION:
if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
- m = transactionDescriptionPattern.matcher(line);
+ m = reTransactionDescription.matcher(line);
if (m.find()) {
if (transactionId == 0)
throw new TransactionParserException(
"Transaction Id is 0 while expecting " +
"description");
- transaction =
- new LedgerTransaction(transactionId, m.group(1),
- m.group(2));
+ String date = m.group(1);
+ try {
+ int equalsIndex = date.indexOf('=');
+ if (equalsIndex >= 0)
+ date = date.substring(equalsIndex + 1);
+ transaction = new LedgerTransaction(transactionId, date,
+ m.group(2));
+ }
+ catch (ParseException e) {
+ e.printStackTrace();
+ return String.format("Error parsing date '%s'", date);
+ }
state = ParserState.EXPECTING_TRANSACTION_DETAILS;
L(String.format("transaction %d created for %s (%s) â" +
- " expecting details", transactionId,
- m.group(1), m.group(2)));
+ " expecting details", transactionId, date,
+ m.group(2)));
}
break;
@@ -244,29 +283,28 @@ public class RetrieveTransactionsTask
if (line.isEmpty()) {
// transaction data collected
if (transaction.existsInDb(db)) {
- db.execSQL("UPDATE transactions SET keep = 1 WHERE id" +
- "=?", new Integer[]{transaction.getId()});
+ db.execSQL("UPDATE transactions SET keep = 1 WHERE " +
+ "profile = ? and id=?",
+ new Object[]{profile.getUuid(),
+ transaction.getId()
+ });
matchedTransactionsCount++;
if (matchedTransactionsCount ==
MATCHING_TRANSACTIONS_LIMIT)
{
db.execSQL("UPDATE transactions SET keep=1 WHERE " +
- "id < ?",
- new Integer[]{transaction.getId()});
- success = true;
+ "profile = ? and id < ?",
+ new Object[]{profile.getUuid(),
+ transaction.getId()
+ });
progress.setTotal(progress.getProgress());
publishProgress(progress);
break LINES;
}
}
else {
- db.execSQL("DELETE from transactions WHERE id=?",
- new Integer[]{transaction.getId()});
- db.execSQL("DELETE from transaction_accounts WHERE " +
- "transaction_id=?",
- new Integer[]{transaction.getId()});
- transaction.insertInto(db);
+ profile.storeTransaction(transaction);
matchedTransactionsCount = 0;
progress.setTotal(maxTransactionId);
}
@@ -275,7 +313,7 @@ public class RetrieveTransactionsTask
L(String.format(
"transaction %s saved â expecting transaction",
transaction.getId()));
- transactionList.add(transaction);
+ transaction.finishLoading();
// sounds like a good idea, but transaction-1 may not be the first one chronologically
// for example, when you add the initial seeding transaction after entering some others
@@ -286,20 +324,22 @@ public class RetrieveTransactionsTask
// }
}
else {
- m = transactionDetailsPattern.matcher(line);
+ m = reTransactionDetails.matcher(line);
if (m.find()) {
String acc_name = m.group(1);
String amount = m.group(2);
String currency = m.group(3);
+ if (currency == null) currency = "";
amount = amount.replace(',', '.');
transaction.addAccount(
new LedgerTransactionAccount(acc_name,
Float.valueOf(amount), currency));
- L(String.format("%s = %s", acc_name, amount));
+ L(String.format("%d: %s = %s", transaction.getId(),
+ acc_name, amount));
}
- else throw new IllegalStateException(
- String.format("Can't parse transaction %d details",
- transactionId));
+ else throw new IllegalStateException(String.format(
+ "Can't parse transaction %d " + "details: %s",
+ transactionId, line));
}
break;
default:
@@ -311,14 +351,17 @@ public class RetrieveTransactionsTask
throwIfCancelled();
- db.execSQL("DELETE FROM transactions WHERE keep = 0");
+ db.execSQL("DELETE FROM transactions WHERE profile=? AND keep = 0",
+ new String[]{profile.getUuid()});
db.setTransactionSuccessful();
Log.d("db", "Updating transaction value stamp");
Date now = new Date();
- MLDB.set_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, now.getTime());
+ profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
Data.lastUpdateDate.set(now);
- Data.transactions.set(transactionList);
+ TransactionListViewModel.scheduleTransactionListReload();
+
+ return null;
}
finally {
db.endTransaction();
@@ -327,40 +370,28 @@ public class RetrieveTransactionsTask
}
}
catch (MalformedURLException e) {
- error = R.string.err_bad_backend_url;
e.printStackTrace();
+ return "Invalid server URL";
}
catch (FileNotFoundException e) {
- error = R.string.err_bad_auth;
e.printStackTrace();
+ return "Invalid user name or password";
}
catch (IOException e) {
- error = R.string.err_net_io_error;
e.printStackTrace();
+ return "Network error";
}
catch (OperationCanceledException e) {
- error = R.string.err_cancelled;
e.printStackTrace();
+ return "Operation cancelled";
}
finally {
Data.backgroundTaskCount.decrementAndGet();
}
- return null;
}
private MainActivity getContext() {
return contextRef.get();
}
- private void addAccount(SQLiteDatabase db, String name) {
- do {
- LedgerAccount acc = new LedgerAccount(name);
- db.execSQL("update accounts set level = ?, keep = 1 where name = ?",
- new Object[]{acc.getLevel(), name});
- db.execSQL("insert into accounts(name, name_upper, parent_name, level) select ?,?," +
- "?,? " + "where (select changes() = 0)",
- new Object[]{name, name.toUpperCase(), acc.getParentName(), acc.getLevel()});
- name = acc.getParentName();
- } while (name != null);
- }
private void throwIfCancelled() {
if (isCancelled()) throw new OperationCanceledException(null);
}