hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-01 05:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ParseFileURI and use it when dealing with file URIs (#1088)

Browse source 
* Add ParseFileURI and use it when dealing with file URIs

Fixes #1059

* Missing file

* Linting
This commit is contained in:
Kegsay 2020-06-04 11:18:08 +01:00 • committed by GitHub
parent d4f9a4bb97
commit e7d1ac84c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 66 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
serverkeyapi/storage/sqlite3/keydb.go
View file

@ -17,8 +17,6 @@ package sqlite3
import (
"context"
"errors"
"net/url"
"time"
"golang.org/x/crypto/ed25519"
@ -46,18 +44,10 @@ func NewDatabase(
serverKey ed25519.PublicKey,
serverKeyID gomatrixserverlib.KeyID,
) (*Database, error) {
uri, err := url.Parse(dataSourceName)
cs, err := sqlutil.ParseFileURI(dataSourceName)
if err != nil {
return nil, err
}
var cs string
if uri.Opaque != "" { // file:filename.db
cs = uri.Opaque
} else if uri.Path != "" { // file:///path/to/filename.db
cs = uri.Path
} else {
return nil, errors.New("no filename or path in connect string")
}
db, err := sqlutil.Open(internal.SQLiteDriverName(), cs, nil)
if err != nil {
return nil, err