let QMPlay2 handle youtube:XXYYZZ URIs

src/gui/CMakeLists.txt

@@ -221,7 +221,8 @@ if(WIN32)
     target_link_libraries(${PROJECT_NAME} Qt5::WinExtras winmm)
 elseif(APPLE)
     set_target_properties(${PROJECT_NAME} PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/BundleInfo.plist.in")
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/BundleInfo.plist.in"
+        MACOSX_BUNDLE_GUI_IDENTIFIER "org.zaps166.${PROJECT_NAME}")
     target_link_libraries(${PROJECT_NAME} ${APPKIT_LIBRARY} ${IOKIT_LIBRARY})
 endif()
 if(USE_TAGLIB AND (NOT WIN32 OR CMAKE_HOST_WIN32))

src/gui/Main.cpp

@@ -287,7 +287,7 @@ static QCommandLineParser *createCmdParser(bool descriptions)
 }
 static QString fileArg(const QString &arg)
 {
-    if (!arg.contains("://"))
+    if (!arg.contains("://") && !arg.startsWith("youtube:"))
     {
         const QFileInfo argInfo(arg);
         if (!argInfo.isAbsolute())

src/gui/MainWidget.cpp

@@ -2035,7 +2035,9 @@ bool MainWidget::eventFilter(QObject *obj, QEvent *event)
 #ifdef Q_OS_MACOS
     else if (event->type() == QEvent::FileOpen)
     {
-        filesToAdd.append(((QFileOpenEvent *)event)->file());
+        auto url = ((QFileOpenEvent *)event)->url();
+        filesToAdd.append(url.scheme() == "file" ? ((QFileOpenEvent *)event)->file()
+            : Functions::maybeExtensionAddress(url.url()));
         fileOpenTimer.start(10);
     }
 #endif

src/gui/Unix/QMPlay2_youtube.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=QMPlay2 --show %u
+Icon=QMPlay2
+Name=Play youtube:VID URI in QMPlay2
+StartupNotify=false
+Type=Application
+Categories=Qt;AudioVideo;Player;Audio;Video;
+MimeType=x-scheme-handler/youtube;
+NoDisplay=true

src/gui/macOS/BundleInfo.plist.in

@@ -111,6 +111,17 @@
             <string>Viewer</string>
         </dict>
     </array>
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>YouTube video ID</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>youtube</string>
+            </array>
+        </dict>
+    </array>
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleExecutable</key>

src/qmplay2/Functions.cpp

@@ -641,13 +641,30 @@ QStringList Functions::getUrlsFromMimeData(const QMimeData *mimeData, const bool
 
 QString Functions::maybeExtensionAddress(const QString &url)
 {
-    for (const QMPlay2Extensions *QMPlay2Ext : QMPlay2Extensions::QMPlay2ExtensionsList())
+    if (url.startsWith("youtube:"))
     {
-        const QString prefix = QMPlay2Ext->matchAddress(url);
-        if (!prefix.isEmpty())
-            return prefix + "://{" + url + "}";
+        // we want to support both youtube:vID and youtube://vID but the latter form
+        // is often passed to us as "youtube://vid" (vID interpreted as the remote host). 
+        // So we also support the full URI form with an empty host string and strip
+        // the leading '/' from the path to recover the intact vID. This implementation
+        // also supports youtube:/vID as a side effect ... why not!
+        auto vid = url.mid(8);
+        while (vid.at(0) == '/')
+        {
+            vid.remove(0, 1);
+        }
+        return maybeExtensionAddress("http://www.youtube.com/watch?v=" + vid);
+    }
+    else
+    {
+        for (const QMPlay2Extensions *QMPlay2Ext : QMPlay2Extensions::QMPlay2ExtensionsList())
+        {
+            const QString prefix = QMPlay2Ext->matchAddress(url);
+            if (!prefix.isEmpty())
+                return prefix + "://{" + url + "}";
+        }
+        return url;
     }
-    return url;
 }
 
 bool Functions::splitPrefixAndUrlIfHasPluginPrefix(const QString &entireUrl, QString *addressPrefixName, QString *url, QString *param)