From 90d7d4c09eb201ef84246c00b5e64c357951c274 Mon Sep 17 00:00:00 2001
From: Timothy Farrell <tim@thecookiejar.me>
Date: Tue, 26 Jun 2018 08:24:42 -0500
Subject: [PATCH] Use one database

This will make backup/restore operations less complicated.
---
 packages/gallery/src/data/album.js  | 4 ++--
 packages/gallery/src/data/file.js   | 4 ++--
 packages/gallery/src/data/image.js  | 4 ++--
 packages/gallery/src/services/db.js | 4 ++++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/gallery/src/data/album.js b/packages/gallery/src/data/album.js
index aa1d5d9..f218463 100644
--- a/packages/gallery/src/data/album.js
+++ b/packages/gallery/src/data/album.js
@@ -1,6 +1,6 @@
 import { TypeSpec } from 'pouchorm';
 
-import { PouchDB } from '../services/db.js';
+import { PouchDB, db } from '../services/db.js';
 import { ImageType } from '../data/image.js';
 import { extractID } from '../utils/conversion.js';
 
@@ -68,7 +68,7 @@ class AlbumSpec extends TypeSpec {
 	// }
 }
 
-export const AlbumType = PouchDB.registerType('Album', AlbumSpec);
+export const AlbumType = PouchDB.registerType('Album', AlbumSpec, db);
 
 ImageType.subscribe((id, deleted, doc) => {
 	if (!deleted) {
diff --git a/packages/gallery/src/data/file.js b/packages/gallery/src/data/file.js
index 46566a2..fce3a93 100644
--- a/packages/gallery/src/data/file.js
+++ b/packages/gallery/src/data/file.js
@@ -1,8 +1,8 @@
 import { TypeSpec } from 'pouchorm';
 
-import { PouchDB } from '../services/db.js';
 import { sha1 } from '../utils/crypto.js';
 import { blobToArrayBuffer } from '../utils/conversion.js';
+import { PouchDB, db } from '../services/db.js';
 
 class FileSpec extends TypeSpec {
 	static getUniqueID(doc) {
@@ -73,4 +73,4 @@ class FileSpec extends TypeSpec {
 	// }
 }
 
-export const FileType = PouchDB.registerType('File', FileSpec);
+export const FileType = PouchDB.registerType('File', FileSpec, db);
diff --git a/packages/gallery/src/data/image.js b/packages/gallery/src/data/image.js
index b79d535..b128e01 100644
--- a/packages/gallery/src/data/image.js
+++ b/packages/gallery/src/data/image.js
@@ -1,6 +1,6 @@
 import { TypeSpec } from 'pouchorm';
 
-import { PouchDB } from '../services/db.js';
+import { PouchDB, db } from '../services/db.js';
 import { blobToArrayBuffer, deepAssign } from '../utils/conversion.js';
 import { backgroundTask } from '../utils/event.js';
 import { FileType } from './file.js';
@@ -122,7 +122,7 @@ const processImportables = backgroundTask(async function _processImportables(ima
 	module.generateThumbnailForImage(image);
 }, false);
 
-export const ImageType = PouchDB.registerType('Image', ImageSpec);
+export const ImageType = PouchDB.registerType('Image', ImageSpec, db);
 
 ImageType.index('originalDate', ['originalDate', 'id']);
 
diff --git a/packages/gallery/src/services/db.js b/packages/gallery/src/services/db.js
index b8628d6..b73e375 100644
--- a/packages/gallery/src/services/db.js
+++ b/packages/gallery/src/services/db.js
@@ -20,3 +20,7 @@ export const PouchDB = core
 	// 	)
 	// )
 	.plugin(PouchORM);
+
+export const db = new PouchDB('gallery');
+
+self.db = db;