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=0fea3004eb211f381cdf058dc46737f36bd6b4e0;hp=5f241f4fd5985ee2954f4ecab2ecd8e62423f81f;hb=6381561a7e02eb6741536166b60cfdd74eb7ad23;hpb=771759a4a8c5b064526de1b4681ad38e47ef4b40
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 5f241f4f..0fea3004 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,6 +42,8 @@ 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;
@@ -51,31 +53,27 @@ import java.util.regex.Pattern;
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.-]+) | ");
- 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 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) {
@@ -92,33 +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();
@@ -129,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;
@@ -148,7 +143,7 @@ public class RetrieveTransactionsTask
while ((line = buf.readLine()) != null) {
throwIfCancelled();
Matcher m;
- m = commentPattern.matcher(line);
+ m = reComment.matcher(line);
if (m.find()) {
// TODO: comments are ignored for now
Log.v("transaction-parser", "Ignoring comment");
@@ -163,15 +158,18 @@ 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));
- profile.storeAccount(acct_name);
- lastAccount = new LedgerAccount(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
@@ -187,14 +185,17 @@ public class RetrieveTransactionsTask
while (!toAppend.isEmpty()) {
String aName = toAppend.pop();
LedgerAccount acc = new LedgerAccount(aName);
- accountList.add(acc);
+ 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(aName);
+ profile.storeAccount(acc);
}
}
- accountList.add(lastAccount);
+ if (!onlyStarred || !lastAccount.isHidden())
+ accountList.add(lastAccount);
accountNames.put(acct_name, null);
state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
@@ -203,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();
@@ -228,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;
@@ -243,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;
@@ -289,7 +298,6 @@ public class RetrieveTransactionsTask
new Object[]{profile.getUuid(),
transaction.getId()
});
- success = true;
progress.setTotal(progress.getProgress());
publishProgress(progress);
break LINES;
@@ -306,7 +314,6 @@ public class RetrieveTransactionsTask
"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
@@ -317,7 +324,7 @@ 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);
@@ -350,9 +357,10 @@ public class RetrieveTransactionsTask
Log.d("db", "Updating transaction value stamp");
Date now = new Date();
- profile.set_option_value(MLDB.OPT_LAST_SCRAPE, now.getTime());
+ profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
Data.lastUpdateDate.set(now);
- Data.transactions.set(transactionList);
+
+ return null;
}
finally {
db.endTransaction();
@@ -361,25 +369,24 @@ 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();