update

KikoPlayProject · Mar 30, 2024 · 48cdd92 · 48cdd92
1 parent 70cf8ec
commit 48cdd92
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/Extension/Modules/lua_playlistinterface.cpp b/Extension/Modules/lua_playlistinterface.cpp
@@ -65,6 +65,9 @@ int PlayListInterface::add(lua_State *L)
             if (itemInfo.contains("position")) insertPosition = itemInfo["position"].toString().split("/", Qt::SkipEmptyParts);
             QString path = itemInfo.value("path").toString();
             bool isBgmCollection = itemInfo.value("bgm_collection").toBool();
+            bool isWebDAVCollection = itemInfo.value("webdav_collection").toBool();
+            const QString webDAVUser = itemInfo.value("webdav_user").toString();
+            const QString webDAVPassword = itemInfo.value("webdav_password").toString();
             QMetaObject::invokeMethod(GlobalObjects::playlist, [&](){
                 if (!path.isEmpty())
                 {
@@ -73,7 +76,14 @@ int PlayListInterface::add(lua_State *L)
                     {
                         parent = GlobalObjects::playlist->getCollection(parent, insertPosition);
                     }
-                    GlobalObjects::playlist->addFolder(path, parent, title);
+                    if (isWebDAVCollection)
+                    {
+                        GlobalObjects::playlist->addWebDAVCollection(parent, title, path, webDAVUser, webDAVPassword);
+                    }
+                    else
+                    {
+                        GlobalObjects::playlist->addFolder(path, parent, title);
+                    }
                 }
                 else
                 {
@@ -112,6 +122,7 @@ int PlayListInterface::curitem(lua_State *L)
             {"src_type", item->type},
             {"state", item->playTimeState},
             {"bgm_collection", item->isBgmCollection},
+            {"webdav_collection", item->isWebDAVCollection()},
             {"add_time", item->addTime},
             {"title", item->title},
             {"anime_title", item->animeTitle},

diff --git a/UI/about.cpp b/UI/about.cpp
@@ -10,16 +10,17 @@ About::About(QWidget *parent) : CFramelessDialog("",parent)
     QLabel *logo=new QLabel(this);
     logo->setPixmap(QPixmap(":/res/images/kikoplay-4.png"));
     logo->setAlignment(Qt::AlignCenter);
-    QLabel *info=new QLabel(tr("KikoPlay - NOT ONLY A Full-Featured Danmu Player<br/>"
-                               "%1 (C) 2023 Kikyou <a style='color: rgb(96, 208, 252);' href=\"https://kikoplayproject.github.io/\">homepage</a> <a style='color: rgb(96, 208, 252);' href=\"https://github.com/KikoPlayProject/KikoPlay\">github</a><br/>"
+    QLabel *info = new QLabel(tr("KikoPlay - NOT ONLY A Full-Featured Danmu Player<br/>"
+                               "%1 (C) 2024 Kikyou <a style='color: rgb(96, 208, 252);' href=\"https://kikoplayproject.github.io/\">homepage</a> <a style='color: rgb(96, 208, 252);' href=\"https://github.com/KikoPlayProject/KikoPlay\">github</a><br/>"
                                "Exchange & BUG Report: 874761809(QQ Group)").arg(GlobalObjects::kikoVersion),this);
     info->setOpenExternalLinks(true);
+    info->setTextInteractionFlags(Qt::LinksAccessibleByMouse | Qt::TextSelectableByMouse);
     info->setAlignment(Qt::AlignCenter);
     QPlainTextEdit *libsInfo=new QPlainTextEdit(this);
     libsInfo->setReadOnly(true);
     QFile aboutFile(":/res/about");
     aboutFile.open(QFile::ReadOnly);
-    if(aboutFile.isOpen())
+    if (aboutFile.isOpen())
     {
         libsInfo->appendPlainText(aboutFile.readAll());
     }

diff --git a/globalobjects.h b/globalobjects.h
@@ -51,7 +51,7 @@ class GlobalObjects
     static QSqlDatabase getDB(int db);
 
     static constexpr const char *normalFont = "Microsoft Yahei UI";
-    static constexpr const char *kikoVersion = "1.0.1";
+    static constexpr const char *kikoVersion = "1.0.2";
 private:
     static void initDatabase(const char *db_names[]);
     static void setDatabase(const char *name, const char *file);

diff --git a/kikoplay.rc b/kikoplay.rc
diff --git a/newVersion/version.json b/newVersion/version.json
@@ -1,5 +1,5 @@
 {
-    "Version":"1.0.1",
+    "Version":"1.0.2",
     "URL":"https://pan.baidu.com/s/1gyT0FU9rioaa77znhAUx2w#list/path=%2FKikoPlay%2F0.4&parentPath=%2F",
-    "Description": "LSDmlK/mjIFhcHDlnKhLaWtvUGxheeaJk+W8gOaXtuiHquWKqOi/kOihjAotIGFwcCBhcGnmm7TmlrDvvIzmlrDlop7ku6XkuIvmianlsZXvvJoKICAtIOaKpOecvOWwj+WKqeaJi++8muingueci+S4gOauteaXtumXtOWQjuaPkOmGkuS8keaBrwogIC0geXQtZGxw5LiL6L2977yaeXQtZGxwIGd1ae+8jOaUr+aMgeS7juWQhOenjeinhumikee9keermeS4i+i9veinhumikQotIOWinuWKoOWFs+iBlOi/h+a7pOiuvue9ru+8jOaUr+aMgeWcqOiHquWKqC/mibnph4/lhbPogZTml7blv73nlaXnibnlrprnmoTmlofku7Yv55uu5b2VCi0gbGlibXB25pu05paw77yM5Lul5Y+K5YW25LuW5ZCE56eN6LCD5pW0L2J1ZyBmaXgK"
+    "Description": "MS4wLjIKICAtIOaSreaUvuWIl+ihqOaUr+aMgea3u+WKoHdlYmRhduWQiOmbhgogIC0g5pys5Zyw5by55bmV5Yqg6L295Y+K5YW25LuW57uG6IqC5LyY5YyWCiAgLSDlvLnluZXohJrmnKzmm7TmlrDvvIh0dWNhb++8jOW8guS4lueVjO+8jOeIseWlh+iJuuetie+8iQo="
 }