jdb/wdiwtlt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed ORM to DbApi.

Browse Source
This commit is contained in:
Jonathan Bernard
2016-03-16 02:52:26 -05:00
parent 7f41f8c4e1
commit 392c94f39c
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/src/main/groovy/com/jdbernard/wdiwtlt/cli/CommandLineInterface.groovy
View File

@ -2,7 +2,7 @@ package com.jdbernard.wdiwtlt.cli
import com.jdbernard.wdiwtlt.ConfigWrapper
import com.jdbernard.wdiwtlt.MediaLibrary
import com.jdbernard.wdiwtlt.db.ORM
import com.jdbernard.wdiwtlt.db.DbApi
import com.jdbernard.wdiwtlt.db.models.*
import com.jdbernard.io.NonBlockingInputStreamReader
import com.jdbernard.util.AnsiEscapeCodeSequence as ANSI
@ -183,10 +183,10 @@ Configuration:
if (!hcfg) exitErr("Cannot load database configuation.")
// Create our database instance
def orm
def dbapi
try {
def hds = new HikariDataSource(hcfg)
orm = new ORM(hds) }
dbapi = new DbApi(hds) }
catch (Exception e) {
exitErr("Could not establish a connection to the database:\n\t" +
e.localizedMessage) }
@ -202,7 +202,7 @@ Configuration:
// Create our CLI object
try {
def cliInst = new CommandLineInterface(new MediaLibrary(orm, libRoot),
def cliInst = new CommandLineInterface(new MediaLibrary(dbapi, libRoot),
vlcj, System.in, System.out, givenCfg)
cliInst.repl() }
catch (Exception e) { e.printStackTrace(); exitErr(e.localizedMessage) }