diff --git a/state_10-40-29-186.db b/state_10-40-29-186.db index 3fc8bc6..e90696a 100644 Binary files a/state_10-40-29-186.db and b/state_10-40-29-186.db differ diff --git a/state_merged.db b/state_merged.db deleted file mode 100644 index 33286f4..0000000 Binary files a/state_merged.db and /dev/null differ diff --git a/sync.sh b/sync.sh index 3ed8b7d..3f1d9a0 100755 --- a/sync.sh +++ b/sync.sh @@ -12,16 +12,11 @@ echo "[$(date '+%H:%M:%S')] Sync from $HOSTNAME..." python3 << PYEOF import sqlite3, os, shutil, tempfile -local_db = os.path.join(os.environ['HERMES_HOME'], 'state.db') -export_db = os.path.join(os.environ['SYNC_DIR'], f"state_{os.environ['HOSTNAME']}.db") +local_db = os.path.join(os.path.expanduser('~/.hermes'), 'state.db') +export_db = os.path.join(os.path.expanduser('~/.hermes-sync'), f"state_{os.environ.get('HOSTNAME') or __import__('socket').gethostname()}.db") tmpdir = tempfile.mkdtemp(prefix='hs_exp_') try: - conn = sqlite3.connect(local_db) - conn.execute('PRAGMA wal_checkpoint(TRUNCATE)') - conn.execute('PRAGMA optimize') - conn.close() - tmp_db = os.path.join(tmpdir, 'db') shutil.copy2(local_db, tmp_db) @@ -75,7 +70,7 @@ fi python3 << 'PYEOF' import sqlite3, os, glob, shutil, tempfile -sync_dir = os.environ['SYNC_DIR'] +sync_dir = os.path.expanduser('~/.hermes-sync') merged_path = os.path.join(sync_dir, 'state_merged.db') db_files = sorted(glob.glob(os.path.join(sync_dir, 'state_*.db'))) db_files = [f for f in db_files if not f.endswith('_merged.db')] @@ -176,8 +171,8 @@ fi python3 << 'PYEOF' import sqlite3, os, shutil, tempfile -hermes_home = os.environ['HERMES_HOME'] -merged_path = os.path.join(os.environ['SYNC_DIR'], 'state_merged.db') +hermes_home = os.path.expanduser('~/.hermes') +merged_path = os.path.join(os.path.expanduser('~/.hermes-sync'), 'state_merged.db') local_db = os.path.join(hermes_home, 'state.db') if not os.path.exists(merged_path): @@ -185,11 +180,6 @@ if not os.path.exists(merged_path): else: tmpdir = tempfile.mkdtemp(prefix='hs_rest_') try: - conn = sqlite3.connect(local_db) - conn.execute('PRAGMA wal_checkpoint(TRUNCATE)') - conn.execute('PRAGMA optimize') - conn.close() - tmp_db = os.path.join(tmpdir, 'db') shutil.copy2(merged_path, tmp_db)