isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move importers to uhabits-core

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-06-21 00:30:32 -04:00
parent 59745fb90f
commit 1069fcfc62
30 changed files with 381 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uhabits-android/build.gradle
View File

@@ -10,11 +10,6 @@ android {
applicationId "org.isoron.uhabits"
minSdkVersion 19
targetSdkVersion 25
buildConfigField "Integer", "databaseVersion", "21"
buildConfigField "String", "databaseFilename", "\"uhabits.db\""
buildConfigField "int", "roboSdk", (System.getenv("ROBO_SDK") ?: "25")
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

BIN
uhabits-android/src/androidTest/assets/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

2
uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
View File

@@ -24,6 +24,7 @@ import android.content.*;
import org.isoron.androidbase.*;
import org.isoron.uhabits.core.*;
import org.isoron.uhabits.core.commands.*;
import org.isoron.uhabits.core.io.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.preferences.*;
import org.isoron.uhabits.core.reminders.*;
@@ -32,7 +33,6 @@ import org.isoron.uhabits.core.ui.*;
import org.isoron.uhabits.core.ui.screens.habits.list.*;
import org.isoron.uhabits.core.utils.*;
import org.isoron.uhabits.intents.*;
import org.isoron.uhabits.io.*;
import org.isoron.uhabits.sync.*;
import org.isoron.uhabits.tasks.*;
import org.isoron.uhabits.widgets.*;

8
uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
View File

@@ -21,6 +21,7 @@ package org.isoron.uhabits;
import org.isoron.uhabits.core.*;
import org.isoron.uhabits.core.commands.*;
import org.isoron.uhabits.core.database.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.models.sqlite.*;
import org.isoron.uhabits.core.preferences.*;
@@ -86,5 +87,12 @@ public class HabitsModule
{
return list;
}
@Provides
@AppScope
public DatabaseOpener getDatabaseOpener(AndroidDatabaseOpener opener)
{
return opener;
}
}

12
uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.java
View File

@@ -67,6 +67,18 @@ public class AndroidDatabase implements Database
db.endTransaction();
}
@Override
public void close()
{
db.close();
}
@Override
public int getVersion()
{
return db.getVersion();
}
@Override
public int update(String tableName,
Map<String, Object> map,

57
uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
* Loop Habit Tracker is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* Loop Habit Tracker 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 for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.database;
import android.content.*;
import android.database.sqlite.*;
import android.support.annotation.*;
import org.isoron.androidbase.*;
import org.isoron.uhabits.core.database.*;
import org.isoron.uhabits.utils.*;
import java.io.*;
import javax.inject.*;
public class AndroidDatabaseOpener implements DatabaseOpener
{
private Context context;
@Inject
public AndroidDatabaseOpener(@NonNull @AppContext Context context)
{
this.context = context;
}
@Override
public Database open(@NonNull File file)
{
return new AndroidDatabase(
SQLiteDatabase.openDatabase(file.getAbsolutePath(), null,
SQLiteDatabase.OPEN_READWRITE));
}
@Override
public File getProductionDatabaseFile()
{
return DatabaseUtils.getDatabaseFile(context);
}
}

2
uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
View File

@@ -23,8 +23,8 @@ import android.support.annotation.*;
import com.google.auto.factory.*;
import org.isoron.uhabits.core.io.*;
import org.isoron.uhabits.core.tasks.*;
import org.isoron.uhabits.io.*;
import java.io.*;

7
uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
View File

@@ -25,11 +25,14 @@ import android.support.annotation.*;
import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.*;
import org.isoron.uhabits.core.utils.*;
import java.io.*;
import java.text.*;
import static org.isoron.uhabits.core.Config.DATABASE_VERSION;
public abstract class DatabaseUtils
{
@Nullable
@@ -72,7 +75,7 @@ public abstract class DatabaseUtils
@NonNull
public static String getDatabaseFilename()
{
String databaseFilename = BuildConfig.databaseFilename;
String databaseFilename = Config.DATABASE_FILENAME;
if (HabitsApplication.isTestMode()) databaseFilename = "test.db";
return databaseFilename;
}
@@ -81,7 +84,7 @@ public abstract class DatabaseUtils
public static void initializeDatabase(Context context)
{
opener = new HabitsDatabaseOpener(context, getDatabaseFilename(),
BuildConfig.databaseVersion);
DATABASE_VERSION);
}
@SuppressWarnings("ResultOfMethodCallIgnored")

1
uhabits-core/build.gradle
View File

@@ -17,6 +17,7 @@ dependencies {
implementation 'com.android.support:support-annotations:25.3.1'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'org.apache.commons:commons-lang3:3.5'
implementation 'org.apache.commons:commons-io:1.3.2'
implementation 'com.google.code.gson:gson:2.7'
testImplementation 'junit:junit:4+'

26
uhabits-core/src/main/java/org/isoron/uhabits/core/Config.java Normal file
View File

@@ -0,0 +1,26 @@
/*
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
* Loop Habit Tracker is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* Loop Habit Tracker 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 for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.core;
public class Config
{
public static final String DATABASE_FILENAME = "uhabits.db";
public static int DATABASE_VERSION = 21;
}

4
uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java
View File

@@ -41,4 +41,8 @@ public interface Database
void setTransactionSuccessful();
void endTransaction();
void close();
int getVersion();
}

31
uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.java Normal file
View File

@@ -0,0 +1,31 @@
/*
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
* Loop Habit Tracker is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* Loop Habit Tracker 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 for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.core.database;
import android.support.annotation.*;
import java.io.*;
public interface DatabaseOpener
{
Database open(@NonNull File file);
File getProductionDatabaseFile();
}

23
uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java
View File

@@ -180,4 +180,27 @@ public class JdbcDatabase implements Database
throw new RuntimeException(e);
}
}
@Override
public void close()
{
try
{
connection.close();
}
catch (SQLException e)
{
throw new RuntimeException(e);
}
}
@Override
public int getVersion()
{
try (Cursor c = select("PRAGMA user_version"))
{
c.moveToNext();
return c.getInt(0);
}
}
}

5
uhabits-android/src/main/java/org/isoron/uhabits/io/AbstractImporter.java → uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.support.annotation.*;
@@ -50,7 +50,6 @@ public abstract class AbstractImporter
byte[] sqliteHeader = "SQLite format 3".getBytes();
byte[] buffer = new byte[sqliteHeader.length];
int count = fis.read(buffer);
if(count < sqliteHeader.length) return false;

4
uhabits-android/src/main/java/org/isoron/uhabits/io/GenericImporter.java → uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.support.annotation.*;

24
uhabits-android/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java → uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.support.annotation.*;
@@ -31,7 +31,6 @@ import java.util.*;
import javax.inject.*;
import static org.isoron.uhabits.utils.DatabaseUtils.executeAsTransaction;
/**
* Class that imports data from HabitBull CSV files.
@@ -53,25 +52,20 @@ public class HabitBullCSVImporter extends AbstractImporter
{
BufferedReader reader = new BufferedReader(new FileReader(file));
String line = reader.readLine();
return line.startsWith("HabitName,HabitDescription,HabitCategory");
}
@Override
public void importHabitsFromFile(@NonNull final File file) throws IOException
{
executeAsTransaction(() -> parseFile(file));
}
private void parseFile(@NonNull File file) throws IOException
public void importHabitsFromFile(@NonNull final File file)
throws IOException
{
CSVReader reader = new CSVReader(new FileReader(file));
HashMap<String, Habit> map = new HashMap<>();
for(String line[] : reader)
for (String line[] : reader)
{
String name = line[0];
if(name.equals("HabitName")) continue;
if (name.equals("HabitName")) continue;
String description = line[1];
String dateString[] = line[3].split("-");
@@ -85,11 +79,11 @@ public class HabitBullCSVImporter extends AbstractImporter
long timestamp = date.getTimeInMillis();
int value = Integer.parseInt(line[4]);
if(value != 1) continue;
if (value != 1) continue;
Habit h = map.get(name);
if(h == null)
if (h == null)
{
h = modelFactory.buildHabit();
h.setName(name);
@@ -99,7 +93,7 @@ public class HabitBullCSVImporter extends AbstractImporter
map.put(name, h);
}
if(!h.getRepetitions().containsTimestamp(timestamp))
if (!h.getRepetitions().containsTimestamp(timestamp))
h.getRepetitions().toggle(timestamp);
}
}

53
uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java → uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,38 +17,34 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.content.*;
import android.database.*;
import android.database.sqlite.*;
import android.support.annotation.*;
import android.util.*;
import org.isoron.androidbase.*;
import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.BuildConfig;
import org.apache.commons.io.*;
import org.isoron.uhabits.core.database.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.utils.DatabaseUtils;
import java.io.*;
import javax.inject.*;
import static org.isoron.uhabits.core.Config.DATABASE_VERSION;
/**
* Class that imports data from database files exported by Loop Habit Tracker.
*/
public class LoopDBImporter extends AbstractImporter
{
@NonNull
private Context context;
private final DatabaseOpener opener;
@Inject
public LoopDBImporter(@NonNull @AppContext Context context,
@NonNull HabitList habits)
public LoopDBImporter(@NonNull HabitList habits,
@NonNull DatabaseOpener opener)
{
super(habits);
this.context = context;
this.opener = opener;
}
@Override
@@ -56,26 +52,23 @@ public class LoopDBImporter extends AbstractImporter
{
if (!isSQLite3File(file)) return false;
SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null,
SQLiteDatabase.OPEN_READONLY);
Database db = opener.open(file);
boolean canHandle = true;
Cursor c = db.rawQuery(
"select count(*) from SQLITE_MASTER where name=? or name=?",
new String[]{ "Checkmarks", "Repetitions" });
Cursor c = db.select("select count(*) from SQLITE_MASTER " +
"where name='Checkmarks' or name='Repetitions'");
if (!c.moveToFirst() || c.getInt(0) != 2)
if (!c.moveToNext() || c.getInt(0) != 2)
{
Log.w("LoopDBImporter", "Cannot handle file: tables not found");
// Log.w("LoopDBImporter", "Cannot handle file: tables not found");
canHandle = false;
}
if (db.getVersion() > BuildConfig.databaseVersion)
if (db.getVersion() > DATABASE_VERSION)
{
Log.w("LoopDBImporter", String.format(
"Cannot handle file: incompatible version: %d > %d",
db.getVersion(), BuildConfig.databaseVersion));
// Log.w("LoopDBImporter", String.format(
// "Cannot handle file: incompatible version: %d > %d",
// db.getVersion(), DATABASE_VERSION));
canHandle = false;
}
@@ -87,9 +80,9 @@ public class LoopDBImporter extends AbstractImporter
@Override
public void importHabitsFromFile(@NonNull File file) throws IOException
{
DatabaseUtils.dispose();
File originalDB = DatabaseUtils.getDatabaseFile(context);
FileUtils.copy(file, originalDB);
DatabaseUtils.initializeDatabase(context);
// DatabaseUtils.dispose();
File originalDB = opener.getProductionDatabaseFile();
FileUtils.copyFile(file, originalDB);
// DatabaseUtils.initializeDatabase(context);
}
}

120
uhabits-android/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java → uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,14 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.database.*;
import android.database.sqlite.*;
import android.support.annotation.*;
import org.isoron.uhabits.core.database.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.utils.DatabaseUtils;
import org.isoron.uhabits.core.utils.*;
import java.io.*;
@@ -32,8 +30,6 @@ import java.util.*;
import javax.inject.*;
import static android.database.sqlite.SQLiteDatabase.*;
/**
* Class that imports database files exported by Rewire.
*/
@@ -41,12 +37,17 @@ public class RewireDBImporter extends AbstractImporter
{
private ModelFactory modelFactory;
@NonNull
private final DatabaseOpener opener;
@Inject
public RewireDBImporter(@NonNull HabitList habits,
@NonNull ModelFactory modelFactory)
@NonNull ModelFactory modelFactory,
@NonNull DatabaseOpener opener)
{
super(habits);
this.modelFactory = modelFactory;
this.opener = opener;
}
@Override
@@ -54,13 +55,11 @@ public class RewireDBImporter extends AbstractImporter
{
if (!isSQLite3File(file)) return false;
SQLiteDatabase db = openDatabase(file.getPath(), null, OPEN_READONLY);
Database db = opener.open(file);
Cursor c = db.select("select count(*) from SQLITE_MASTER " +
"where name='CHECKINS' or name='UNIT'");
Cursor c = db.rawQuery(
"select count(*) from SQLITE_MASTER where name=? or name=?",
new String[]{ "CHECKINS", "UNIT" });
boolean result = (c.moveToFirst() && c.getInt(0) == 2);
boolean result = (c.moveToNext() && c.getInt(0) == 2);
c.close();
db.close();
@@ -70,56 +69,24 @@ public class RewireDBImporter extends AbstractImporter
@Override
public void importHabitsFromFile(@NonNull File file) throws IOException
{
String path = file.getPath();
final SQLiteDatabase db = openDatabase(path, null, OPEN_READONLY);
DatabaseUtils.executeAsTransaction(() -> createHabits(db));
Database db = opener.open(file);
db.beginTransaction();
createHabits(db);
db.setTransactionSuccessful();
db.endTransaction();
db.close();
}
private void createCheckmarks(@NonNull SQLiteDatabase db,
@NonNull Habit habit,
int rewireHabitId)
private void createHabits(Database db)
{
Cursor c = null;
try
{
String[] params = { Integer.toString(rewireHabitId) };
c = db.rawQuery(
"select distinct date from checkins where habit_id=? and type=2",
params);
if (!c.moveToFirst()) return;
do
{
String date = c.getString(0);
int year = Integer.parseInt(date.substring(0, 4));
int month = Integer.parseInt(date.substring(4, 6));
int day = Integer.parseInt(date.substring(6, 8));
GregorianCalendar cal = DateUtils.getStartOfTodayCalendar();
cal.set(year, month - 1, day);
habit.getRepetitions().toggle(cal.getTimeInMillis());
} while (c.moveToNext());
}
finally
{
if (c != null) c.close();
}
}
private void createHabits(SQLiteDatabase db)
{
Cursor c = null;
try
{
c = db.rawQuery(
"select _id, name, description, schedule, active_days, " +
"repeating_count, days, period from habits", new String[0]);
if (!c.moveToFirst()) return;
c = db.select("select _id, name, description, schedule, " +
"active_days, repeating_count, days, period " +
"from habits");
if (!c.moveToNext()) return;
do
{
@@ -174,20 +141,51 @@ public class RewireDBImporter extends AbstractImporter
}
}
private void createReminder(SQLiteDatabase db,
Habit habit,
int rewireHabitId)
private void createCheckmarks(@NonNull Database db,
@NonNull Habit habit,
int rewireHabitId)
{
Cursor c = null;
try
{
String[] params = { Integer.toString(rewireHabitId) };
c = db.select(
"select distinct date from checkins where habit_id=? and type=2",
params);
if (!c.moveToNext()) return;
do
{
String date = c.getString(0);
int year = Integer.parseInt(date.substring(0, 4));
int month = Integer.parseInt(date.substring(4, 6));
int day = Integer.parseInt(date.substring(6, 8));
GregorianCalendar cal = DateUtils.getStartOfTodayCalendar();
cal.set(year, month - 1, day);
habit.getRepetitions().toggle(cal.getTimeInMillis());
} while (c.moveToNext());
}
finally
{
if (c != null) c.close();
}
}
private void createReminder(Database db, Habit habit, int rewireHabitId)
{
String[] params = { Integer.toString(rewireHabitId) };
Cursor c = null;
try
{
c = db.rawQuery(
c = db.select(
"select time, active_days from reminders where habit_id=? limit 1",
params);
if (!c.moveToFirst()) return;
if (!c.moveToNext()) return;
int rewireReminder = Integer.parseInt(c.getString(0));
if (rewireReminder <= 0 || rewireReminder >= 1440) return;

48
uhabits-android/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java → uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,14 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.database.*;
import android.database.sqlite.*;
import android.support.annotation.*;
import org.isoron.uhabits.core.database.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.utils.DatabaseUtils;
import org.isoron.uhabits.core.utils.*;
import java.io.*;
@@ -39,12 +37,17 @@ public class TickmateDBImporter extends AbstractImporter
{
private ModelFactory modelFactory;
@NonNull
private final DatabaseOpener opener;
@Inject
public TickmateDBImporter(@NonNull HabitList habits,
@NonNull ModelFactory modelFactory)
@NonNull ModelFactory modelFactory,
@NonNull DatabaseOpener opener)
{
super(habits);
this.modelFactory = modelFactory;
this.opener = opener;
}
@Override
@@ -52,14 +55,11 @@ public class TickmateDBImporter extends AbstractImporter
{
if (!isSQLite3File(file)) return false;
SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null,
SQLiteDatabase.OPEN_READONLY);
Database db = opener.open(file);
Cursor c = db.select("select count(*) from SQLITE_MASTER " +
"where name='tracks' or name='track2groups'");
Cursor c = db.rawQuery(
"select count(*) from SQLITE_MASTER where name=? or name=?",
new String[]{"tracks", "track2groups"});
boolean result = (c.moveToFirst() && c.getInt(0) == 2);
boolean result = (c.moveToNext() && c.getInt(0) == 2);
c.close();
db.close();
@@ -69,15 +69,15 @@ public class TickmateDBImporter extends AbstractImporter
@Override
public void importHabitsFromFile(@NonNull File file) throws IOException
{
final SQLiteDatabase db =
SQLiteDatabase.openDatabase(file.getPath(), null,
SQLiteDatabase.OPEN_READONLY);
DatabaseUtils.executeAsTransaction(() -> createHabits(db));
final Database db = opener.open(file);
db.beginTransaction();
createHabits(db);
db.setTransactionSuccessful();
db.endTransaction();
db.close();
}
private void createCheckmarks(@NonNull SQLiteDatabase db,
private void createCheckmarks(@NonNull Database db,
@NonNull Habit habit,
int tickmateTrackId)
{
@@ -86,10 +86,10 @@ public class TickmateDBImporter extends AbstractImporter
try
{
String[] params = {Integer.toString(tickmateTrackId)};
c = db.rawQuery(
c = db.select(
"select distinct year, month, day from ticks where _track_id=?",
params);
if (!c.moveToFirst()) return;
if (!c.moveToNext()) return;
do
{
@@ -109,15 +109,15 @@ public class TickmateDBImporter extends AbstractImporter
}
}
private void createHabits(SQLiteDatabase db)
private void createHabits(Database db)
{
Cursor c = null;
try
{
c = db.rawQuery("select _id, name, description from tracks",
c = db.select("select _id, name, description from tracks",
new String[0]);
if (!c.moveToFirst()) return;
if (!c.moveToNext()) return;
do
{

4
uhabits-android/src/main/java/org/isoron/uhabits/io/package-info.java → uhabits-core/src/main/java/org/isoron/uhabits/core/io/package-info.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -20,4 +20,4 @@
/**
* Provides classes that deal with importing from and exporting to files.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;

2
uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java
View File

@@ -66,7 +66,7 @@ public class BaseUnitTest
}
@After
public void tearDown()
public void tearDown() throws Exception
{
validateMockitoUsage();
DateUtils.setFixedLocalTime(null);

74
uhabits-android/src/androidTest/java/org/isoron/uhabits/io/HabitsCSVExporterTest.java → uhabits-core/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,41 +17,40 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.content.*;
import android.support.test.*;
import android.support.test.runner.*;
import android.test.suitebuilder.annotation.*;
import org.isoron.androidbase.utils.*;
import org.apache.commons.io.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.io.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;
import org.junit.runner.*;
import java.io.*;
import java.nio.file.*;
import java.util.*;
import java.util.zip.*;
@RunWith(AndroidJUnit4.class)
@MediumTest
public class HabitsCSVExporterTest extends BaseAndroidTest
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class HabitsCSVExporterTest extends BaseUnitTest
{
private File baseDir;
@Before
public void setUp()
public void setUp() throws Exception
{
super.setUp();
habitList.add(fixtures.createShortHabit());
habitList.add(fixtures.createEmptyHabit());
baseDir = Files.createTempDirectory("csv").toFile();
assertNotNull(baseDir);
}
fixtures.purgeHabits(habitList);
fixtures.createShortHabit();
fixtures.createEmptyHabit();
Context targetContext = InstrumentationRegistry.getTargetContext();
baseDir = targetContext.getCacheDir();
@Override
public void tearDown() throws Exception
{
FileUtils.deleteDirectory(baseDir);
super.tearDown();
}
@Test
@@ -78,20 +77,6 @@ public class HabitsCSVExporterTest extends BaseAndroidTest
assertPathExists("Scores.csv");
}
private void assertAbsolutePathExists(String s)
{
File file = new File(s);
assertTrue(
String.format("File %s should exist", file.getAbsolutePath()),
file.exists());
}
private void assertPathExists(String s)
{
assertAbsolutePathExists(
String.format("%s/%s", baseDir.getAbsolutePath(), s));
}
private void unzip(File file) throws IOException
{
ZipFile zip = new ZipFile(file);
@@ -105,14 +90,27 @@ public class HabitsCSVExporterTest extends BaseAndroidTest
String outputFilename =
String.format("%s/%s", baseDir.getAbsolutePath(),
entry.getName());
File outputFile = new File(outputFilename);
File parent = outputFile.getParentFile();
File out = new File(outputFilename);
File parent = out.getParentFile();
if (parent != null) parent.mkdirs();
FileUtils.copy(stream, outputFile);
IOUtils.copy(stream, new FileOutputStream(out));
}
zip.close();
}
private void assertPathExists(String s)
{
assertAbsolutePathExists(
String.format("%s/%s", baseDir.getAbsolutePath(), s));
}
private void assertAbsolutePathExists(String s)
{
File file = new File(s);
assertTrue(
String.format("File %s should exist", file.getAbsolutePath()),
file.exists());
}
}

80
uhabits-android/src/androidTest/java/org/isoron/uhabits/io/ImportTest.java → uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -17,40 +17,37 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.io;
package org.isoron.uhabits.core.io;
import android.content.*;
import android.support.test.*;
import android.support.test.runner.*;
import android.test.suitebuilder.annotation.*;
import android.support.annotation.*;
import org.isoron.androidbase.utils.*;
import org.apache.commons.io.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.database.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.utils.*;
import org.junit.*;
import org.junit.runner.*;
import java.io.*;
import java.sql.*;
import java.util.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import sun.reflect.generics.reflectiveObjects.*;
@RunWith(AndroidJUnit4.class)
@MediumTest
public class ImportTest extends BaseAndroidTest
import static junit.framework.TestCase.assertFalse;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.core.IsEqual.*;
import static org.isoron.uhabits.core.models.Frequency.THREE_TIMES_PER_WEEK;
import static org.junit.Assert.assertTrue;
public class ImportTest extends BaseUnitTest
{
private Context context;
@Override
@Before
public void setUp()
public void setUp() throws Exception
{
super.setUp();
DateUtils.setFixedLocalTime(null);
fixtures.purgeHabits(habitList);
context = InstrumentationRegistry.getInstrumentation().getContext();
}
@Test
@@ -78,8 +75,7 @@ public class ImportTest extends BaseAndroidTest
Habit habit = habitList.getByPosition(0);
assertThat(habit.getName(), equalTo("Wake up early"));
assertThat(habit.getFrequency(),
equalTo(Frequency.THREE_TIMES_PER_WEEK));
assertThat(habit.getFrequency(), equalTo(THREE_TIMES_PER_WEEK));
assertTrue(containsRepetition(habit, 2016, 3, 14));
assertTrue(containsRepetition(habit, 2016, 3, 16));
assertFalse(containsRepetition(habit, 2016, 3, 17));
@@ -94,8 +90,7 @@ public class ImportTest extends BaseAndroidTest
Habit habit = habitList.getByPosition(0);
assertThat(habit.getName(), equalTo("Wake up early"));
assertThat(habit.getFrequency(),
equalTo(Frequency.THREE_TIMES_PER_WEEK));
assertThat(habit.getFrequency(), equalTo(THREE_TIMES_PER_WEEK));
assertFalse(habit.hasReminder());
assertFalse(containsRepetition(habit, 2015, 12, 31));
assertTrue(containsRepetition(habit, 2016, 1, 18));
@@ -104,8 +99,7 @@ public class ImportTest extends BaseAndroidTest
habit = habitList.getByPosition(1);
assertThat(habit.getName(), equalTo("brush teeth"));
assertThat(habit.getFrequency(),
equalTo(Frequency.THREE_TIMES_PER_WEEK));
assertThat(habit.getFrequency(), equalTo(THREE_TIMES_PER_WEEK));
assertThat(habit.hasReminder(), equalTo(true));
Reminder reminder = habit.getReminder();
@@ -139,8 +133,13 @@ public class ImportTest extends BaseAndroidTest
private void copyAssetToFile(String assetPath, File dst) throws IOException
{
InputStream in = context.getAssets().open(assetPath);
FileUtils.copy(in, dst);
InputStream in = getClass().getResourceAsStream(assetPath);
if(in == null) {
File file = new File("uhabits-core/src/test/resources/" + assetPath);
if(file.exists()) in = new FileInputStream(file);
}
IOUtils.copy(in, new FileOutputStream(dst));
}
private void importFromFile(String assetFilename) throws IOException
@@ -150,9 +149,34 @@ public class ImportTest extends BaseAndroidTest
assertTrue(file.exists());
assertTrue(file.canRead());
GenericImporter importer = component.getGenericImporter();
assertThat(importer.canHandle(file), is(true));
DatabaseOpener opener = new DatabaseOpener() {
@Override
public Database open(@NonNull File file)
{
try
{
return new JdbcDatabase(DriverManager.getConnection(
String.format("jdbc:sqlite:%s", file.getAbsolutePath())));
}
catch (SQLException e)
{
throw new RuntimeException(e);
}
}
@Override
public File getProductionDatabaseFile()
{
throw new NotImplementedException();
}
};
GenericImporter importer = new GenericImporter(habitList,
new LoopDBImporter(habitList, opener),
new RewireDBImporter(habitList, modelFactory, opener),
new TickmateDBImporter(habitList, modelFactory, opener),
new HabitBullCSVImporter(habitList, modelFactory));
assertTrue(importer.canHandle(file));
importer.importHabitsFromFile(file);
file.delete();

2
uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
View File

@@ -74,7 +74,7 @@ public class RepetitionListTest extends BaseUnitTest
@Override
@After
public void tearDown()
public void tearDown() throws Exception
{
super.tearDown();
}

2
uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
View File

@@ -74,7 +74,7 @@ public class SQLiteHabitListTest extends BaseUnitTest
}
@Override
public void tearDown()
public void tearDown() throws Exception
{
habitList.getObservable().removeListener(listener);
super.tearDown();

1
uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecordTest.java
View File

@@ -23,7 +23,6 @@ package org.isoron.uhabits.core.models.sqlite.records;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.models.sqlite.records.*;
import org.junit.*;
import static org.hamcrest.MatcherAssert.assertThat;

0
uhabits-android/src/androidTest/assets/habitbull.csv → uhabits-core/src/test/resources/habitbull.csv
View File

0
uhabits-android/src/androidTest/assets/loop.db → uhabits-core/src/test/resources/loop.db
View File

0
uhabits-android/src/androidTest/assets/rewire.db → uhabits-core/src/test/resources/rewire.db
View File

0
uhabits-android/src/androidTest/assets/tickmate.db → uhabits-core/src/test/resources/tickmate.db
View File