Review Request 129992: Fix save image/sound files to relative path in kvtml2writer

[Albert Astals Cid]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/129992/#review102833
-----------------------------------------------------------




keduvocdocument/keduvockvtml2writer.cpp (line 537)
<https://git.reviewboard.kde.org/r/129992/#comment68478>

    i don't think using docDirUrl and upUrl is what we want, since you're going two levels up in the url now, no?


- Albert Astals Cid


On March 6, 2017, 11:24 p.m., Xin Huang wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/129992/
> -----------------------------------------------------------
> 
> (Updated March 6, 2017, 11:24 p.m.)
> 
> 
> Review request for KDE Edu.
> 
> 
> Repository: libkeduvocdocument
> 
> 
> Description
> -------
> 
> ```
> bool KEduVocKvtml2Writer::writeTranslation( QDomElement &translationElement, KEduVocTranslation* translation )
> {
>     // ...
>     // sound
>     if ( !translation->soundUrl().isEmpty() ) {
>         QString urlString;
>         qDebug() << "soundUrl" << translation->soundUrl();
>         if ( KIO::upUrl(m_doc->url().adjusted(QUrl::RemoveFilename)).isParentOf( translation->soundUrl()) ) {
>             // try to save as relative url
>             urlString = m_doc->url().toString(QUrl::RemoveFilename) + '/' + translation->soundUrl().toString();     // <------------ HERE
>         } else {
>             urlString =  translation->soundUrl().url();
>         }
>         qDebug() << "urlString" << urlString;
>         translationElement.appendChild( newTextElement( KVTML_SOUND, urlString ) );
>     }
> ```
> 
> Notice the line marked: The soundUrl of a translation parley passed in is "file:///path/to/kvtml/kvtmlfilename_files/File:En-us-Word.ogg", and the `m_doc->url()` is "file:///path/to/kvtml/kvtmlfilename.kvtml". By the old logic saving as relative url, the result will be "file:///path/to/kvtml/file:///path/to/kvtml/kvtmlfilename_files/Files:En-us-word.ogg".
> 
> 
> Diffs
> -----
> 
>   keduvocdocument/keduvockvtml2writer.cpp ff9c292 
> 
> Diff: https://git.reviewboard.kde.org/r/129992/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Xin Huang
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20170313/73c1ca37/attachment.html>