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=e3f50cc37f67a5e555f7284a47a74fd7daedd6e5;hpb=b011feba6b09f35a0e07c9502f126877b5f05905;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 e3f50cc3..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,32 +1,35 @@
/*
* 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;
import android.annotation.SuppressLint;
-import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
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.ui.transaction_list.TransactionListFragment;
+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;
@@ -38,69 +41,84 @@ import java.io.InputStreamReader;
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 {
- private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+) | ");
- private static final Pattern transactionDescriptionPattern =
+public class RetrieveTransactionsTask
+ 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;
- private boolean success;
- public RetrieveTransactionsTask(WeakReference contextRef) {
+ 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 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) {
super.onProgressUpdate(values);
- TransactionListFragment context = getContext();
+ MainActivity context = getContext();
if (context == null) return;
context.onRetrieveProgress(values[0]);
}
@Override
protected void onPreExecute() {
super.onPreExecute();
- TransactionListFragment context = getContext();
+ MainActivity context = getContext();
if (context == null) return;
context.onRetrieveStart();
}
@Override
- protected void onPostExecute(Void aVoid) {
- super.onPostExecute(aVoid);
- TransactionListFragment context = getContext();
+ 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();
- TransactionListFragment context = getContext();
+ MainActivity context = getContext();
if (context == null) return;
- context.onRetrieveDone(false);
+ context.onRetrieveDone(null);
}
@SuppressLint("DefaultLocale")
@Override
- protected Void doInBackground(Params... 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<>();
+ HashMap accountNames = new HashMap<>();
+ LedgerAccount lastAccount = null;
+ boolean onlyStarred = Data.optShowOnlyStarred.get();
+ Data.backgroundTaskCount.incrementAndGet();
try {
- HttpURLConnection http =
- NetworkUtil.prepare_connection(params[0].getBackendPref(), "journal");
+ HttpURLConnection http = NetworkUtil.prepareConnection("journal");
http.setAllowUserInteraction(false);
publishProgress(progress);
- TransactionListFragment ctx = getContext();
+ MainActivity ctx = getContext();
if (ctx == null) return null;
try (SQLiteDatabase db = MLDB.getWritableDatabase()) {
try (InputStream resp = http.getInputStream()) {
@@ -109,11 +127,13 @@ public class RetrieveTransactionsTask extends
db.beginTransaction();
try {
db.execSQL("UPDATE transactions set keep=0");
+ db.execSQL("update account_values set keep=0;");
+ db.execSQL("update accounts set keep=0;");
- int state = ParserState.EXPECTING_JOURNAL;
+ 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;
@@ -121,25 +141,100 @@ public class RetrieveTransactionsTask extends
LedgerTransaction transaction = null;
LINES:
while ((line = buf.readLine()) != null) {
- if (isCancelled()) break;
+ throwIfCancelled();
Matcher m;
- //L(String.format("State is %d", state));
+ 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 ParserState.EXPECTING_JOURNAL:
- if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
+ case EXPECTING_ACCOUNT:
if (line.equals("General Journal
")) {
state = ParserState.EXPECTING_TRANSACTION;
L("â expecting transaction");
+ Data.accounts.set(accountList);
+ continue;
+ }
+ 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));
+
+ 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");
+ }
+ break;
+
+ case EXPECTING_ACCOUNT_AMOUNT:
+ m = reAccountValue.matcher(line);
+ boolean match_found = false;
+ while (m.find()) {
+ throwIfCancelled();
+
+ match_found = true;
+ String value = m.group(1);
+ String currency = m.group(2);
+ if (currency == null) currency = "";
+ value = value.replace(',', '.');
+ L("curr=" + currency + ", value=" + value);
+ profile.storeAccountValue(lastAccount.getName(), currency,
+ Float.valueOf(value));
+ lastAccount.addAmount(Float.parseFloat(value), currency);
+ }
+
+ if (match_found) {
+ state = ParserState.EXPECTING_ACCOUNT;
+ L("â expecting account");
}
+
break;
- case ParserState.EXPECTING_TRANSACTION:
+
+ 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;
L(String.format(
- "found transaction %d â expecting " + "description",
+ "found transaction %d â expecting description",
transactionId));
progress.setProgress(++processedTransactionCount);
if (maxTransactionId < transactionId)
@@ -149,64 +244,76 @@ public class RetrieveTransactionsTask extends
progress.setTotal(transactionId);
publishProgress(progress);
}
- m = endPattern.matcher(line);
+ m = reEnd.matcher(line);
if (m.find()) {
- L("--- transaction list complete ---");
- success = true;
+ L("--- transaction value complete ---");
break LINES;
}
break;
- case ParserState.EXPECTING_TRANSACTION_DESCRIPTION:
+
+ 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;
- case ParserState.EXPECTING_TRANSACTION_DETAILS:
+
+ case EXPECTING_TRANSACTION_DETAILS:
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 == 100) {
+ 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);
}
state = ParserState.EXPECTING_TRANSACTION;
L(String.format(
- "transaction %s saved â expecting " + "transaction",
+ "transaction %s saved â expecting transaction",
transaction.getId()));
+ 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
@@ -217,72 +324,81 @@ public class RetrieveTransactionsTask extends
// }
}
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:
throw new RuntimeException(
- String.format("Unknown parser state %d", state));
+ String.format("Unknown parser updating %s",
+ state.name()));
}
}
- if (!isCancelled()) {
- db.execSQL("DELETE FROM transactions WHERE keep = 0");
- db.setTransactionSuccessful();
- }
+
+ throwIfCancelled();
+
+ 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();
+ profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
+ Data.lastUpdateDate.set(now);
+ TransactionListViewModel.scheduleTransactionListReload();
+
+ return null;
}
finally {
db.endTransaction();
}
}
}
-
- if (success && !isCancelled()) {
- Log.d("db", "Updating transaction list stamp");
- MLDB.set_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP,
- new Date().getTime());
- ctx.model.reloadTransactions(ctx);
- }
}
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) {
+ e.printStackTrace();
+ return "Operation cancelled";
+ }
+ finally {
+ Data.backgroundTaskCount.decrementAndGet();
}
- return null;
}
- TransactionListFragment getContext() {
+ private MainActivity getContext() {
return contextRef.get();
}
+ private void throwIfCancelled() {
+ if (isCancelled()) throw new OperationCanceledException(null);
+ }
- public static class Params {
- private SharedPreferences backendPref;
-
- public Params(SharedPreferences backendPref) {
- this.backendPref = backendPref;
- }
- SharedPreferences getBackendPref() {
- return backendPref;
- }
+ private enum ParserState {
+ EXPECTING_ACCOUNT, EXPECTING_ACCOUNT_AMOUNT, EXPECTING_JOURNAL, EXPECTING_TRANSACTION,
+ EXPECTING_TRANSACTION_DESCRIPTION, EXPECTING_TRANSACTION_DETAILS
}
public class Progress {
@@ -315,11 +431,4 @@ public class RetrieveTransactionsTask extends
super(message);
}
}
-
- private class ParserState {
- static final int EXPECTING_JOURNAL = 0;
- static final int EXPECTING_TRANSACTION = 1;
- static final int EXPECTING_TRANSACTION_DESCRIPTION = 2;
- static final int EXPECTING_TRANSACTION_DETAILS = 3;
- }
}