X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=f0a7e0e6f0152b3f2c2291b4dd10bda8d79959ac;hp=190aa7ed543cb9918706fd1591b1068acb4febab;hb=a4ab99925eefb09f23745bae8bdeb29f76aa6bc2;hpb=160edb0e0fe58f5076329e8622db414001895530 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 190aa7ed..f0a7e0e6 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Damyan Ivanov. + * Copyright © 2019 Damyan Ivanov. * This file is part of Mobile-Ledger. * Mobile-Ledger is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -21,12 +21,16 @@ 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.TransactionListActivity; +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.activity.MainActivity; +import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel; import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.NetworkUtil; @@ -38,7 +42,10 @@ import java.io.InputStreamReader; import java.lang.ref.WeakReference; import java.net.HttpURLConnection; import java.net.MalformedURLException; +import java.net.URLDecoder; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -50,60 +57,79 @@ public class RetrieveTransactionsTask extends private static final Pattern transactionDescriptionPattern = Pattern.compile(" contextRef; + protected WeakReference contextRef; protected int error; + // %3A is '=' + 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 boolean success; - public RetrieveTransactionsTask(WeakReference contextRef) { + public RetrieveTransactionsTask(WeakReference contextRef) { this.contextRef = contextRef; } private static final void L(String msg) { -// Log.d("transaction-parser", msg); + Log.d("transaction-parser", msg); } @Override protected void onProgressUpdate(Progress... values) { super.onProgressUpdate(values); - TransactionListActivity context = getContext(); + MainActivity context = getContext(); if (context == null) return; context.onRetrieveProgress(values[0]); } @Override protected void onPreExecute() { super.onPreExecute(); - TransactionListActivity context = getContext(); + MainActivity context = getContext(); if (context == null) return; context.onRetrieveStart(); } @Override protected void onPostExecute(Void aVoid) { super.onPostExecute(aVoid); - TransactionListActivity context = getContext(); + MainActivity context = getContext(); if (context == null) return; context.onRetrieveDone(success); } + @Override + protected void onCancelled() { + super.onCancelled(); + MainActivity context = getContext(); + if (context == null) return; + context.onRetrieveDone(false); + } @SuppressLint("DefaultLocale") @Override protected Void doInBackground(Params... params) { Progress progress = new Progress(); int maxTransactionId = Progress.INDETERMINATE; success = false; + List accountList = new ArrayList<>(); + LedgerAccount lastAccount = null; + Data.backgroundTaskCount.incrementAndGet(); try { HttpURLConnection http = NetworkUtil.prepare_connection(params[0].getBackendPref(), "journal"); http.setAllowUserInteraction(false); publishProgress(progress); - TransactionListActivity ctx = contextRef.get(); + MainActivity ctx = getContext(); if (ctx == null) return null; - try (SQLiteDatabase db = MLDB.getWritableDatabase(ctx)) { + try (SQLiteDatabase db = MLDB.getWritableDatabase()) { try (InputStream resp = http.getInputStream()) { if (http.getResponseCode() != 200) throw new IOException( String.format("HTTP error %d", http.getResponseCode())); 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")); @@ -114,25 +140,69 @@ 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)); + //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 = account_name_re.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); + + state = ParserState.EXPECTING_ACCOUNT_AMOUNT; + L("→ expecting account amount"); } break; - case ParserState.EXPECTING_TRANSACTION: + + case EXPECTING_ACCOUNT_AMOUNT: + m = account_value_re.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); + db.execSQL( + "insert or replace into account_values(account, currency, value, keep) values(?, ?, ?, 1);", + new Object[]{lastAccount.getName(), + currency, + Float.valueOf(value) + }); + lastAccount.addAmount(Float.parseFloat(value), currency); + } + + if (match_found) { + state = ParserState.EXPECTING_ACCOUNT; + L("→ expecting account"); + } + + break; + + case EXPECTING_TRANSACTION: if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; m = transactionStartPattern.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) @@ -144,12 +214,13 @@ public class RetrieveTransactionsTask extends } m = endPattern.matcher(line); if (m.find()) { - L("--- transaction list complete ---"); + L("--- transaction value complete ---"); success = true; break LINES; } break; - case ParserState.EXPECTING_TRANSACTION_DESCRIPTION: + + case EXPECTING_TRANSACTION_DESCRIPTION: if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; m = transactionDescriptionPattern.matcher(line); if (m.find()) { @@ -167,7 +238,8 @@ public class RetrieveTransactionsTask extends m.group(1), m.group(2))); } break; - case ParserState.EXPECTING_TRANSACTION_DETAILS: + + case EXPECTING_TRANSACTION_DETAILS: if (line.isEmpty()) { // transaction data collected if (transaction.existsInDb(db)) { @@ -198,7 +270,7 @@ public class RetrieveTransactionsTask extends state = ParserState.EXPECTING_TRANSACTION; L(String.format( - "transaction %s saved → expecting " + "transaction", + "transaction %s saved → expecting transaction", transaction.getId())); // sounds like a good idea, but transaction-1 may not be the first one chronologically @@ -214,10 +286,11 @@ public class RetrieveTransactionsTask extends if (m.find()) { String acc_name = m.group(1); String amount = m.group(2); + String currency = m.group(3); amount = amount.replace(',', '.'); transaction.addAccount( new LedgerTransactionAccount(acc_name, - Float.valueOf(amount))); + Float.valueOf(amount), currency)); L(String.format("%s = %s", acc_name, amount)); } else throw new IllegalStateException( @@ -227,7 +300,7 @@ public class RetrieveTransactionsTask extends break; default: throw new RuntimeException( - String.format("Unknown parser state %d", state)); + String.format("Unknown parser updating %s", state.name())); } } if (!isCancelled()) { @@ -242,9 +315,9 @@ public class RetrieveTransactionsTask extends } if (success && !isCancelled()) { - Log.d("db", "Updating transaction list stamp"); - MLDB.set_option_value(ctx, MLDB.OPT_TRANSACTION_LIST_STAMP, new Date().getTime()); - ctx.model.reloadTransactions(ctx); + Log.d("db", "Updating transaction value stamp"); + MLDB.set_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, new Date().getTime()); + TransactionListViewModel.scheduleTransactionListReload(ctx); } } catch (MalformedURLException e) { @@ -259,11 +332,33 @@ public class RetrieveTransactionsTask extends error = R.string.err_net_io_error; e.printStackTrace(); } + finally { + Data.backgroundTaskCount.decrementAndGet(); + } return null; } - TransactionListActivity getContext() { + 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); + } + + private enum ParserState { + EXPECTING_ACCOUNT, EXPECTING_ACCOUNT_AMOUNT, EXPECTING_JOURNAL, EXPECTING_TRANSACTION, + EXPECTING_TRANSACTION_DESCRIPTION, EXPECTING_TRANSACTION_DETAILS + } public static class Params { private SharedPreferences backendPref; @@ -306,11 +401,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; - } }