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=b8a341344fb478ab5d5202173c02a1b257e26923;hp=aeb49a5f104b9ebcebda479b961fe83e855464db;hb=0bbdc409d82da31324c031f36607510f17d992e6;hpb=6b740c280c79b0170321f533747cdbfc3e179a29 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 aeb49a5f..b8a34134 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -17,15 +17,17 @@ package net.ktnx.mobileledger.async; -import android.content.Context; +import android.annotation.SuppressLint; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.os.AsyncTask; +import android.util.Log; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.LedgerTransaction; -import net.ktnx.mobileledger.model.LedgerTransactionItem; -import net.ktnx.mobileledger.utils.MobileLedgerDatabase; +import net.ktnx.mobileledger.model.LedgerTransactionAccount; +import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; +import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.NetworkUtil; import java.io.BufferedReader; @@ -36,152 +38,223 @@ import java.io.InputStreamReader; import java.lang.ref.WeakReference; import java.net.HttpURLConnection; import java.net.MalformedURLException; +import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; -class RetrieveTransactionsTask extends AsyncTask { - class Params { - static final int DEFAULT_LIMIT = 100; - private SharedPreferences backendPref; - private String accountsRoot; - private int limit; - - Params(SharedPreferences backendPref) { - this.backendPref = backendPref; - this.accountsRoot = null; - this.limit = DEFAULT_LIMIT; - } - Params(SharedPreferences backendPref, String accountsRoot) { - this(backendPref, accountsRoot, DEFAULT_LIMIT); - } - Params(SharedPreferences backendPref, String accountsRoot, int limit) { - this.backendPref = backendPref; - this.accountsRoot = accountsRoot; - this.limit = limit; - } - String getAccountsRoot() { - return accountsRoot; - } - SharedPreferences getBackendPref() { - return backendPref; - } - int getLimit() { - return limit; - } - } - private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+)"); +public class RetrieveTransactionsTask extends + AsyncTask { + private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+)"); private static final Pattern transactionDescriptionPattern = Pattern.compile(" contextRef; + Pattern.compile("^\\s+" + "(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?"); + private static final Pattern endPattern = Pattern.compile("\\bid=\"addmodal\""); + protected WeakReference contextRef; protected int error; + private boolean success; + public RetrieveTransactionsTask(WeakReference contextRef) { + this.contextRef = contextRef; + } + private static final void L(String msg) { +// Log.d("transaction-parser", msg); + } + @Override + protected void onProgressUpdate(Progress... values) { + super.onProgressUpdate(values); + TransactionListFragment context = getContext(); + if (context == null) return; + context.onRetrieveProgress(values[0]); + } + @Override + protected void onPreExecute() { + super.onPreExecute(); + TransactionListFragment context = getContext(); + if (context == null) return; + context.onRetrieveStart(); + } + @Override + protected void onPostExecute(Void aVoid) { + super.onPostExecute(aVoid); + TransactionListFragment context = getContext(); + if (context == null) return; + context.onRetrieveDone(success); + } + @Override + protected void onCancelled() { + super.onCancelled(); + TransactionListFragment 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; try { HttpURLConnection http = NetworkUtil.prepare_connection(params[0].getBackendPref(), "journal"); http.setAllowUserInteraction(false); - publishProgress(0); - Context ctx = contextRef.get(); + publishProgress(progress); + TransactionListFragment ctx = getContext(); if (ctx == null) return null; - try (MobileLedgerDatabase dbh = new MobileLedgerDatabase(ctx)) { - try (SQLiteDatabase db = dbh.getWritableDatabase()) { - try (InputStream resp = http.getInputStream()) { - if (http.getResponseCode() != 200) throw new IOException( - String.format("HTTP error %d", http.getResponseCode())); - db.beginTransaction(); - try { - String root = params[0].getAccountsRoot(); - if (root == null) db.execSQL("DELETE FROM transaction_history;"); - else { - StringBuilder sql = new StringBuilder(); - sql.append("DELETE FROM transaction_history "); - sql.append( - "where id in (select transactions.id from transactions "); - sql.append("join transaction_accounts "); - sql.append( - "on transactions.id=transaction_accounts.transaction_id "); - sql.append("where transaction_accounts.account_name like ?||'%'"); - db.execSQL(sql.toString(), new String[]{root}); - } + try (SQLiteDatabase db = MLDB.getWritableDatabase(ctx.getActivity())) { + 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"); - int state = ParserState.EXPECTING_JOURNAL; - String line; - BufferedReader buf = - new BufferedReader(new InputStreamReader(resp, "UTF-8")); - - int transactionCount = 0; - String transactionId = null; - LedgerTransaction transaction = null; - while ((line = buf.readLine()) != null) { - switch (state) { - case ParserState.EXPECTING_JOURNAL: { - if (line.equals("

General Journal

")) - state = ParserState.EXPECTING_TRANSACTION; - continue; + int state = ParserState.EXPECTING_JOURNAL; + String line; + BufferedReader buf = + new BufferedReader(new InputStreamReader(resp, "UTF-8")); + + int processedTransactionCount = 0; + int transactionId = 0; + int matchedTransactionsCount = 0; + LedgerTransaction transaction = null; + LINES: + while ((line = buf.readLine()) != null) { + if (isCancelled()) break; + Matcher m; + //L(String.format("State is %d", state)); + switch (state) { + case ParserState.EXPECTING_JOURNAL: + if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; + if (line.equals("

General Journal

")) { + state = ParserState.EXPECTING_TRANSACTION; + L("→ expecting transaction"); } - case ParserState.EXPECTING_TRANSACTION: { - Matcher m = transactionStartPattern.matcher(line); - if (m.find()) { - transactionId = m.group(1); - state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION; - } + break; + case ParserState.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", + transactionId)); + progress.setProgress(++processedTransactionCount); + if (maxTransactionId < transactionId) + maxTransactionId = transactionId; + if ((progress.getTotal() == Progress.INDETERMINATE) || + (progress.getTotal() < transactionId)) + progress.setTotal(transactionId); + publishProgress(progress); } - case ParserState.EXPECTING_TRANSACTION_DESCRIPTION: { - Matcher m = transactionDescriptionPattern.matcher(line); - if (m.find()) { - if (transactionId == null) - throw new TransactionParserException( - "Transaction Id is null while expecting description"); - - transaction = - new LedgerTransaction(transactionId, m.group(1), - m.group(2)); - state = ParserState.EXPECTING_TRANSACTION_DETAILS; - } + m = endPattern.matcher(line); + if (m.find()) { + L("--- transaction list complete ---"); + success = true; + break LINES; } - case ParserState.EXPECTING_TRANSACTION_DETAILS: { - if (transaction == null) + break; + case ParserState.EXPECTING_TRANSACTION_DESCRIPTION: + if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; + m = transactionDescriptionPattern.matcher(line); + if (m.find()) { + if (transactionId == 0) throw new TransactionParserException( - "Transaction is null while expecting details"); - if (line.isEmpty()) { - // transaction data collected - transaction.insertInto(db); + "Transaction Id is 0 while expecting " + + "description"); + + transaction = + new LedgerTransaction(transactionId, m.group(1), + m.group(2)); + state = ParserState.EXPECTING_TRANSACTION_DETAILS; + L(String.format("transaction %d created for %s (%s) →" + + " expecting details", transactionId, + m.group(1), m.group(2))); + } + break; + case ParserState.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()}); + matchedTransactionsCount++; - state = ParserState.EXPECTING_TRANSACTION; - publishProgress(++transactionCount); + if (matchedTransactionsCount == 100) { + db.execSQL("UPDATE transactions SET keep=1 WHERE " + + "id < ?", + new Integer[]{transaction.getId()}); + success = true; + progress.setTotal(progress.getProgress()); + publishProgress(progress); + break LINES; + } } else { - Matcher m = transactionDetailsPattern.matcher(line); - if (m.find()) { - String acc_name = m.group(1); - String amount = m.group(2); - amount = amount.replace(',', '.'); - transaction.add_item( - new LedgerTransactionItem(acc_name, - Float.valueOf(amount))); - } - else throw new IllegalStateException(String.format( - "Can't" + " parse transaction details")); + 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); + matchedTransactionsCount = 0; + progress.setTotal(maxTransactionId); + } + + state = ParserState.EXPECTING_TRANSACTION; + L(String.format( + "transaction %s saved → expecting " + "transaction", + transaction.getId())); + +// 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 +// if (transactionId == 1) { +// L("This was the initial transaction. Terminating " + +// "parser"); +// break LINES; +// } + } + else { + m = transactionDetailsPattern.matcher(line); + 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), currency)); + L(String.format("%s = %s", acc_name, amount)); } + else throw new IllegalStateException( + String.format("Can't parse transaction %d details", + transactionId)); } - default: - throw new RuntimeException( - String.format("Unknown " + "parser state %d", - state)); - } + break; + default: + throw new RuntimeException( + String.format("Unknown parser state %d", state)); } - db.setTransactionSuccessful(); } - finally { - db.endTransaction(); + if (!isCancelled()) { + db.execSQL("DELETE FROM transactions WHERE keep = 0"); + db.setTransactionSuccessful(); } } + finally { + db.endTransaction(); + } } } + + if (success && !isCancelled()) { + Log.d("db", "Updating transaction list stamp"); + MLDB.set_option_value(ctx.getActivity(), MLDB.OPT_TRANSACTION_LIST_STAMP, + new Date().getTime()); + ctx.model.reloadTransactions(ctx); + } } catch (MalformedURLException e) { error = R.string.err_bad_backend_url; @@ -197,8 +270,44 @@ class RetrieveTransactionsTask extends AsyncTask getContextRef() { - return contextRef; + TransactionListFragment getContext() { + return contextRef.get(); + } + + public static class Params { + private SharedPreferences backendPref; + + public Params(SharedPreferences backendPref) { + this.backendPref = backendPref; + } + SharedPreferences getBackendPref() { + return backendPref; + } + } + + public class Progress { + public static final int INDETERMINATE = -1; + private int progress; + private int total; + Progress() { + this(INDETERMINATE, INDETERMINATE); + } + Progress(int progress, int total) { + this.progress = progress; + this.total = total; + } + public int getProgress() { + return progress; + } + protected void setProgress(int progress) { + this.progress = progress; + } + public int getTotal() { + return total; + } + protected void setTotal(int total) { + this.total = total; + } } private class TransactionParserException extends IllegalStateException {