From 9ff1b4764625b8e27233c17096f63e54a44ed7d1 Mon Sep 17 00:00:00 2001
From: WeidiDeng <weidi_deng@icloud.com>
Date: Mon, 27 Sep 2021 22:28:36 +0800
Subject: [PATCH 1/2] fix webdav prop get (#1023)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了displayname为空，potplayer可以正常使用webdav功能
---
 pkg/webdav/prop.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/webdav/prop.go b/pkg/webdav/prop.go
index 80464e3a..7d0b5aac 100644
--- a/pkg/webdav/prop.go
+++ b/pkg/webdav/prop.go
@@ -188,7 +188,7 @@ func props(ctx context.Context, fs *filesystem.FileSystem, ls LockSystem, fi Fil
 		}
 		// Otherwise, it must either be a live property or we don't know it.
 		if prop := liveProps[pn]; prop.findFn != nil && (prop.dir || !isDir) {
-			innerXML, err := prop.findFn(ctx, fs, ls, "", fi)
+			innerXML, err := prop.findFn(ctx, fs, ls, fi.GetName(), fi)
 			if err != nil {
 				return nil, err
 			}

From a3b4a22dbca875a55b3e5198ab0ce47dd517bd9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=83=B3=E5=87=BA=E7=BD=91=E5=90=8D=E5=95=A6?=
 <55868015+sb-child@users.noreply.github.com>
Date: Fri, 29 Oct 2021 20:30:26 +0800
Subject: [PATCH 2/2] bug fix: can't connect to postgres database (#992)

* bug fix: can't connect to postgres database

* remove useless arg

* remove vscode setting
---
 .gitignore     | 1 +
 models/init.go | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 40a55874..276b3704 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ version.lock
 *.ini
 conf/conf.ini
 /statik/
+.vscode/
diff --git a/models/init.go b/models/init.go
index 447922a5..8cfa788a 100644
--- a/models/init.go
+++ b/models/init.go
@@ -35,7 +35,14 @@ func Init() {
 		case "UNSET", "sqlite", "sqlite3":
 			// 未指定数据库或者明确指定为 sqlite 时，使用 SQLite3 数据库
 			db, err = gorm.Open("sqlite3", util.RelativePath(conf.DatabaseConfig.DBFile))
-		case "mysql", "postgres", "mssql":
+		case "postgres":
+			db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable",
+				conf.DatabaseConfig.Host,
+				conf.DatabaseConfig.User,
+				conf.DatabaseConfig.Password,
+				conf.DatabaseConfig.Name,
+				conf.DatabaseConfig.Port))
+		case "mysql", "mssql":
 			db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=%s&parseTime=True&loc=Local",
 				conf.DatabaseConfig.User,
 				conf.DatabaseConfig.Password,