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=7b898593870280e2b1302dff63ce4c44f95c3e0e;hp=634bb61b60d9753ea9ee27c52ef53ef5ff78071a;hb=7b2966220b258cc2f1becae3ff91ef62a36cc01b;hpb=985b25d6284011d906db1399790832008c50b07d 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 634bb61b..7b898593 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -18,7 +18,6 @@ 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; @@ -29,8 +28,8 @@ 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; @@ -49,25 +48,26 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -public class RetrieveTransactionsTask extends - AsyncTask { - public static final int MATCHING_TRANSACTIONS_LIMIT = 100; +public class RetrieveTransactionsTask + extends AsyncTask { + public static final int MATCHING_TRANSACTIONS_LIMIT = 50; + public static final Pattern commentPattern = Pattern.compile("^\\s*;"); private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+)"); + "id=\"transaction-(\\d+)\">([\\d.-]+)"); private static final Pattern transactionDescriptionPattern = Pattern.compile(" 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\":\"([^\"]+)\""); + // %3A is '=' private boolean success; public RetrieveTransactionsTask(WeakReference contextRef) { this.contextRef = contextRef; @@ -105,16 +105,17 @@ public class RetrieveTransactionsTask extends } @SuppressLint("DefaultLocale") @Override - protected Void doInBackground(Params... params) { + protected Void 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<>(); LedgerAccount lastAccount = null; Data.backgroundTaskCount.incrementAndGet(); try { - HttpURLConnection http = - NetworkUtil.prepare_connection(params[0].getBackendPref(), "journal"); + HttpURLConnection http = NetworkUtil.prepare_connection("journal"); http.setAllowUserInteraction(false); publishProgress(progress); MainActivity ctx = getContext(); @@ -125,6 +126,8 @@ public class RetrieveTransactionsTask extends 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;"); @@ -142,6 +145,12 @@ public class RetrieveTransactionsTask extends while ((line = buf.readLine()) != null) { throwIfCancelled(); Matcher m; + m = commentPattern.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: @@ -158,7 +167,7 @@ public class RetrieveTransactionsTask extends acct_name = acct_name.replace("\"", ""); L(String.format("found account: %s", acct_name)); - addAccount(db, acct_name); + profile.storeAccount(acct_name); lastAccount = new LedgerAccount(acct_name); accountList.add(lastAccount); @@ -179,12 +188,8 @@ public class RetrieveTransactionsTask extends 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); } @@ -243,16 +248,21 @@ public class RetrieveTransactionsTask extends 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()}); + "profile = ? and id < ?", + new Object[]{profile.getUuid(), + transaction.getId() + }); success = true; progress.setTotal(progress.getProgress()); publishProgress(progress); @@ -260,12 +270,7 @@ public class RetrieveTransactionsTask extends } } 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); } @@ -274,6 +279,8 @@ public class RetrieveTransactionsTask extends L(String.format( "transaction %s saved → expecting transaction", transaction.getId())); + transaction.finishLoading(); + transactionList.add(transaction); // 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 @@ -289,39 +296,43 @@ public class RetrieveTransactionsTask extends 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 updating %s", state.name())); + String.format("Unknown parser updating %s", + state.name())); } } 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(); + profile.set_option_value(MLDB.OPT_LAST_SCRAPE, now.getTime()); + Data.lastUpdateDate.set(now); + Data.transactions.set(transactionList); } finally { db.endTransaction(); } } } - - if (success && !isCancelled()) { - 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) { error = R.string.err_bad_backend_url; @@ -335,6 +346,10 @@ public class RetrieveTransactionsTask extends error = R.string.err_net_io_error; e.printStackTrace(); } + catch (OperationCanceledException e) { + error = R.string.err_cancelled; + e.printStackTrace(); + } finally { Data.backgroundTaskCount.decrementAndGet(); } @@ -343,17 +358,6 @@ public class RetrieveTransactionsTask extends 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); } @@ -363,17 +367,6 @@ public class RetrieveTransactionsTask extends EXPECTING_TRANSACTION_DESCRIPTION, EXPECTING_TRANSACTION_DETAILS } - 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;