126847 2006-05-06 14:41:07 +0000 webdav can be replaced with http 2006-06-11 12:32:01 +0000 1 1 2 Applications amarok general 1.4-beta3 Fedora RPMs Linux RESOLVED FIXED NOR wishlist --- 0 kde-bugzilla amarok-bugs-null 0 oldest_to_newest 436792 0 kde-bugzilla 2006-05-06 14:41:07 +0000 Version: 1.4-beta3 (using KDE KDE 3.5.2) Installed from: Fedora RPMs As there are no plans to use KIO to fetch data packets for the various engines to use, instead bestowing data access to the engines themselves, we can at least rely on the fact that most engines can stream from HTTP URLs and, when giving them webdav:// URLs (e.g. when a user browses a WebDAV site in the Files pane), replace webdav:// with http://. (Technical note: WebDAV _is_ an addition of methods for HTTP for directory listing etc., but the actual retrieval of the file occurs through regular HTTP GET methods.) 438485 1 16064 kde-bugzilla 2006-05-13 12:59:26 +0000 Created attachment 16064 Patch Simple patch, tested and found to work. 438688 2 thiago 2006-05-14 11:23:03 +0000 You have to replace webdavs with https too. 438738 3 kde-bugzilla 2006-05-14 14:09:11 +0000 I didn't do it on purpose. Can any of our current engines handle https anyway? 438772 4 thiago 2006-05-14 17:52:44 +0000 Well, they for sure can't handle "webdavs". 438828 5 16090 kde-bugzilla 2006-05-14 23:49:33 +0000 Created attachment 16090 Patch (Take 2) Changes webdav to http and webdavs to https. 439879 6 ruiz 2006-05-18 14:54:29 +0000 SVN commit 542146 by seb: Recognise webdav(s) as an http(s) protocol BUG: 126847 CCMAIL: kde-bugzilla@future.shiny.co.il M +2 -0 ChangeLog M +8 -1 src/enginecontroller.cpp --- trunk/extragear/multimedia/amarok/ChangeLog #542145:542146 @@ -21,6 +21,8 @@ (BR 127043) BUGFIXES: + * Allow for recognition of the webdav protocol. Patch by Ilya + Konstantinov <kde-bugzilla@future.shiny.co.il>. (BR 126847) * Setting a rating on an unplayed track would affect score generated. Patch by Patrick Muench <s7mon@web.de>. (BR 127475) * Stop tags with different capitalisation being treated as the same --- trunk/extragear/multimedia/amarok/src/enginecontroller.cpp #542145:542146 @@ -312,7 +312,7 @@ if ( !m_playFailureCount ) failure_time.start(); - const KURL url = bundle.url(); + KURL url = bundle.url(); debug() << "Loading URL: " << url.url() << endl; m_lastMetadata.clear(); @@ -332,6 +332,13 @@ else amaroK::StatusBar::instance()->shortMessage( i18n("Connecting to stream source...") ); + // WebDAV protocol is HTTP with extensions (and the "webdav" scheme + // is a KDE-ism anyway). Most engines cope with HTTP streaming, but + // not through KIO, so they don't support KDE-isms. + if ( url.protocol() == "webdav" ) + url.setProtocol( "http" ); + else if ( url.protocol() == "webdavs" ) + url.setProtocol( "https" ); if( m_engine->load( url, url.protocol() == "http" || url.protocol() == "rtsp" ) ) { 16064 2006-05-13 12:59:26 +0000 2006-05-14 23:49:33 +0000 Patch amarok-webdav-to-http.patch text/plain 865 kde-bugzilla LS0tIGVuZ2luZWNvbnRyb2xsZXIuY3BwLm9sZAkyMDA2LTA1LTEzIDEzOjQ1OjA1LjAwMDAwMDAw MCArMDMwMAorKysgZW5naW5lY29udHJvbGxlci5jcHAJMjAwNi0wNS0xMyAxMzo1Mzo1NS4wMDAw MDAwMDAgKzAzMDAKQEAgLTMxMiw3ICszMTIsNyBAQAogICAgIGlmICggIW1fcGxheUZhaWx1cmVD b3VudCApCiAgICAgICAgIGZhaWx1cmVfdGltZS5zdGFydCgpOwogCi0gICAgY29uc3QgS1VSTCB1 cmwgPSBidW5kbGUudXJsKCk7CisgICAgS1VSTCB1cmwgPSBidW5kbGUudXJsKCk7CiAgICAgZGVi dWcoKSA8PCAiTG9hZGluZyBVUkw6ICIgPDwgdXJsLnVybCgpIDw8IGVuZGw7CiAgICAgbV9sYXN0 TWV0YWRhdGEuY2xlYXIoKTsKIApAQCAtMzMyLDYgKzMzMiwxMSBAQAogICAgIGVsc2UKICAgICAg ICAgYW1hcm9LOjpTdGF0dXNCYXI6Omluc3RhbmNlKCktPnNob3J0TWVzc2FnZSggaTE4bigiQ29u bmVjdGluZyB0byBzdHJlYW0gc291cmNlLi4uIikgKTsKIAorICAgIC8vIFdlYkRBViBwcm90b2Nv bCBpcyBIVFRQIHdpdGggZXh0ZW5zaW9ucyAoYW5kIHRoZSAid2ViZGF2IiBzY2hlbWUKKyAgICAv LyBpcyBhIEtERS1pc20gYW55d2F5KS4gTW9zdCBlbmdpbmVzIGNvcGUgd2l0aCBIVFRQIHN0cmVh bWluZywgYnV0CisgICAgLy8gbm90IHRocm91Z2ggS0lPLCBzbyB0aGV5IGRvbid0IHN1cHBvcnQg S0RFLWlzbXMuCisgICAgaWYgKCB1cmwucHJvdG9jb2woKSA9PSAid2ViZGF2IiApCisgICAgICAg IHVybC5zZXRQcm90b2NvbCggImh0dHAiICk7CiAKICAgICBpZiggbV9lbmdpbmUtPmxvYWQoIHVy bCwgdXJsLnByb3RvY29sKCkgPT0gImh0dHAiIHx8IHVybC5wcm90b2NvbCgpID09ICJydHNwIiAp ICkKICAgICB7Cg== 16090 2006-05-14 23:49:33 +0000 2006-05-14 23:49:33 +0000 Patch (Take 2) amarok-webdav-to-http.patch text/plain 947 kde-bugzilla LS0tIGVuZ2luZWNvbnRyb2xsZXIuY3BwLm9sZAkyMDA2LTA1LTEzIDEzOjQ1OjA1LjAwMDAwMDAw MCArMDMwMAorKysgZW5naW5lY29udHJvbGxlci5jcHAJMjAwNi0wNS0xNSAwMDowMDo1NS4wMDAw MDAwMDAgKzAzMDAKQEAgLTMxMiw3ICszMTIsNyBAQAogICAgIGlmICggIW1fcGxheUZhaWx1cmVD b3VudCApCiAgICAgICAgIGZhaWx1cmVfdGltZS5zdGFydCgpOwogCi0gICAgY29uc3QgS1VSTCB1 cmwgPSBidW5kbGUudXJsKCk7CisgICAgS1VSTCB1cmwgPSBidW5kbGUudXJsKCk7CiAgICAgZGVi dWcoKSA8PCAiTG9hZGluZyBVUkw6ICIgPDwgdXJsLnVybCgpIDw8IGVuZGw7CiAgICAgbV9sYXN0 TWV0YWRhdGEuY2xlYXIoKTsKIApAQCAtMzMyLDYgKzMzMiwxMyBAQAogICAgIGVsc2UKICAgICAg ICAgYW1hcm9LOjpTdGF0dXNCYXI6Omluc3RhbmNlKCktPnNob3J0TWVzc2FnZSggaTE4bigiQ29u bmVjdGluZyB0byBzdHJlYW0gc291cmNlLi4uIikgKTsKIAorICAgIC8vIFdlYkRBViBwcm90b2Nv bCBpcyBIVFRQIHdpdGggZXh0ZW5zaW9ucyAoYW5kIHRoZSAid2ViZGF2IiBzY2hlbWUKKyAgICAv LyBpcyBhIEtERS1pc20gYW55d2F5KS4gTW9zdCBlbmdpbmVzIGNvcGUgd2l0aCBIVFRQIHN0cmVh bWluZywgYnV0CisgICAgLy8gbm90IHRocm91Z2ggS0lPLCBzbyB0aGV5IGRvbid0IHN1cHBvcnQg S0RFLWlzbXMuCisgICAgaWYgKCB1cmwucHJvdG9jb2woKSA9PSAid2ViZGF2IiApCisgICAgICAg IHVybC5zZXRQcm90b2NvbCggImh0dHAiICk7CisgICAgZWxzZSBpZiAoIHVybC5wcm90b2NvbCgp ID09ICJ3ZWJkYXZzIiApCisgICAgICAgIHVybC5zZXRQcm90b2NvbCggImh0dHBzIiApOwogCiAg ICAgaWYoIG1fZW5naW5lLT5sb2FkKCB1cmwsIHVybC5wcm90b2NvbCgpID09ICJodHRwIiB8fCB1 cmwucHJvdG9jb2woKSA9PSAicnRzcCIgKSApCiAgICAgewo=