Улучшена поддержка открытия File URI - формат file://...

Aleksoid1978 · Nov 19, 2024 · 21f6959 · 21f6959
1 parent 060842f
commit 21f6959
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/src/DSUtil/FileHandle.cpp b/src/DSUtil/FileHandle.cpp
@@ -168,6 +168,24 @@ CStringW GetFullCannonFilePath(LPCWSTR path)
 	return newPath;
 }
 
+bool ConvertFileUriToPath(CStringW& uri)
+{
+	if (StartsWith(uri, L"file://")) {
+		DWORD size = uri.GetLength();
+		CStringW path;
+		if (S_OK == UrlUnescapeW(uri.GetBuffer(), path.GetBuffer(size), &size, URL_ESCAPE_URI_COMPONENT)) {
+			path.ReleaseBuffer(size);
+			if (S_OK == PathCreateFromUrlW(path.GetString(), path.GetBuffer(), &size, 0)) {
+				path.ReleaseBuffer(size);
+				uri = path;
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
 void StripToRoot(CStringW& path)
 {
 	BOOL ret = ::PathStripToRootW(path.GetBuffer());

diff --git a/src/DSUtil/FileHandle.h b/src/DSUtil/FileHandle.h
@@ -50,6 +50,8 @@ CStringW GetCombineFilePath(LPCWSTR dir, LPCWSTR file);
 // creates a full and canonical path
 CStringW GetFullCannonFilePath(LPCWSTR path);
 
+bool ConvertFileUriToPath(CStringW& uri);
+
 void StripToRoot(CStringW& path);
 CStringW GetStripToRoot(LPCWSTR path);
 

diff --git a/src/apps/mplayerc/Content.cpp b/src/apps/mplayerc/Content.cpp
@@ -273,9 +273,8 @@ namespace Content {
 			CString url = CString(match[k].first, match[k].length());
 			url.Trim();
 
-			if (playlist_type == PLAYLIST_RAM && StartsWith(url, L"file://")) {
-				url.Delete(0, 7);
-				url.Replace('/', '\\');
+			if (playlist_type == PLAYLIST_RAM) {
+				ConvertFileUriToPath(url);
 			}
 
 			CUrlParser dst;
@@ -345,9 +344,8 @@ namespace Content {
 			CString fn2 = CString(match[k].first, match[k].length());
 			fn2.Trim();
 
-			if (playlist_type == PLAYLIST_RAM && StartsWith(fn2, L"file://")) {
-				fn2.Delete(0, 7);
-				fn2.Replace('/', '\\');
+			if (playlist_type == PLAYLIST_RAM) {
+				ConvertFileUriToPath(fn2);
 			}
 
 			if (fn2.Find(':') < 0 && fn2.Find(L"\\\\") != 0 && fn2.Find(L"//") != 0) {

diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp
@@ -47,20 +47,19 @@
 #define ID_PLSMENU_POSITION_BOTTOM 2008
 #define ID_PLSMENU_POSITION_FLOAT  2009
 
-WCHAR LastChar(const CStringW& str)
+static WCHAR LastChar(const CStringW& str)
 {
 	int len = str.GetLength();
 	return len > 0 ? str.GetAt(len - 1) : 0;
 }
 
 static CStringW MakePath(CStringW path)
 {
-	if (::PathIsURLW(path) || Youtube::CheckURL(path)) { // skip URLs
-		if (path.Left(8).MakeLower() == L"file:///") {
-			path.Delete(0, 8);
-			path.Replace('/', '\\');
-		}
+	if (ConvertFileUriToPath(path)) {
+		return path;
+	}
 
+	if (::PathIsURLW(path) || Youtube::CheckURL(path)) { // skip URLs
 		return path;
 	}
 
@@ -1450,7 +1449,7 @@ void CPlayerPlaylistBar::ParsePlayList(std::list<CString>& fns, CSubtitleItemLis
 
 static CString CombinePath(CStringW base, const CStringW& relative)
 {
-	if (StartsWith(relative, L":\\", 1) || StartsWith(relative, L"\\")) {
+	if (StartsWith(relative, L":\\", 1) || StartsWith(relative, L"\\") || StartsWith(relative, L"file://")) {
 		return relative;
 	}
 
@@ -2145,8 +2144,10 @@ void CPlayerPlaylistBar::Append(std::list<CString>& fns, const bool bMulti, CSub
 	}
 
 	for (auto& fn : fns) {
-		if (::PathIsURLW(fn)) {
-			fn = UrlDecode(fn);
+		if (!ConvertFileUriToPath(fn)) {
+			if (::PathIsURLW(fn)) {
+				fn = UrlDecode(fn);
+			}
 		}
 	}