[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-edu-devel
Subject: Re: Review Request 129992: Fix save image/sound files to relative path in kvtml2writer
From: Xin Huang <xinhuang.abc () gmail ! com>
Date: 2017-03-23 23:34:36
Message-ID: 20170323233436.917.53718 () mimi ! kde ! org
[Download RAW message or body]
--===============7063975898997002962==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/129992/
-----------------------------------------------------------
(Updated March 23, 2017, 5:34 p.m.)
Status
------
This change has been marked as submitted.
Review request for KDE Edu.
Changes
-------
Submitted with commit c70c1433528bc75e934960dd114dd8beae626656 by Albert Astals Cid \
on behalf of Xin Huang to branch Applications/17.04.
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
--===============7063975898997002962==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/129992/">https://git.reviewboard.kde.org/r/129992/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="12" style="border: 1px gray solid; \
border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> <tr>
<td>
<h1 style="margin: 0; padding: 0; font-size: 10pt;">This change has been marked as \
submitted.</h1> </td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for KDE Edu.</div>
<div>By Xin Huang.</div>
<p style="color: grey;"><i>Updated March 23, 2017, 5:34 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Submitted with commit c70c1433528bc75e934960dd114dd8beae626656 by Albert \
Astals Cid on behalf of Xin Huang to branch Applications/17.04.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
libkeduvocdocument
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;"><div class="codehilite" style="background: \
#f8f8f8"><pre style="line-height: 125%"><span></span><span style="color: #008000; \
font-weight: bold">bool</span> <span style="color: #008000; font-weight: \
bold">KEduVocKvtml2Writer</span><span style="color: #666666">:</span><span \
style="color: #AA22FF">:writeTranslation</span><span style="color: #666666">(</span> \
<span style="color: #008000; font-weight: bold">QDomElement</span> <span \
style="color: #666666">&</span><span style="color: #008000; font-weight: \
bold">translationElement</span><span style="color: #666666">,</span> <span \
style="color: #008000; font-weight: bold">KEduVocTranslation</span><span \
style="color: #666666">*</span> <span style="color: #008000; font-weight: bold"> \
translation</span> <span style="color: #666666">)</span> {
<span style="color: #666666">//</span> <span style="color: #666666">...</span>
<span style="color: #666666">//</span> sound
if ( <span style="color: #666666">!</span>translation<span style="color: \
#666666">-></span>soundUrl()<span style="color: #666666">.</span>isEmpty() ) <span \
style="border: 1px solid #FF0000">{</span> QString urlString;
qDebug() <span style="color: #666666"><<</span> <span style="color: \
#BA2121">"soundUrl"</span> <span style="color: #666666"><<</span> \
translation<span style="color: #666666">-></span>soundUrl(); if ( KIO<span \
style="color: #666666">::</span>upUrl(m_doc<span style="color: \
#666666">-></span><span style="color: #008000">url()</span><span style="color: \
#666666">.</span>adjusted(QUrl<span style="color: \
#666666">::</span>RemoveFilename))<span style="color: #666666">.</span>isParentOf( \
translation<span style="color: #666666">-></span>soundUrl()) ) <span \
style="border: 1px solid #FF0000">{</span>
<span style="color: #666666">//</span> try to save as <span style="color: \
#008000">relative</span> <span style="color: #008000">url</span> urlString <span \
style="color: #666666">=</span> m_doc<span style="color: #666666">-></span><span \
style="color: #008000">url()</span><span style="color: \
#666666">.</span>toString(QUrl<span style="color: #666666">::</span>RemoveFilename) \
<span style="color: #666666">+</span> <span style="color: #BA2121">'/'</span> \
<span style="color: #666666">+</span> translation<span style="color: \
#666666">-></span>soundUrl()<span style="color: #666666">.</span>toString(); \
<span style="color: #666666">//</span> <span style="color: \
#666666"><------------</span> HERE } <span style="color: #008000; font-weight: \
bold">else</span> { urlString <span style="color: #666666">=</span> \
translation<span style="color: #666666">-></span>soundUrl()<span style="color: \
#666666">.</span><span style="color: #008000">url()</span>; }
<span style="color: #008000; font-weight: bold">qDebug</span><span \
style="color: #666666">()</span> <span style="color: #666666"><<</span> <span \
style="color: #BA2121">"urlString"</span> <span style="color: \
#666666"><<</span> <span style="color: #008000; font-weight: \
bold">urlString</span><span style="color: #666666">;</span> <span style="color: \
#008000; font-weight: bold">translationElement</span><span style="color: #0000FF; \
font-weight: bold">.appendChild</span><span style="color: #666666">(</span> <span \
style="color: #008000; font-weight: bold">newTextElement</span><span style="color: \
#666666">(</span> <span style="color: #008000; font-weight: \
bold">KVTML_SOUND</span><span style="color: #666666">,</span> <span style="color: \
#008000; font-weight: bold">urlString</span> <span style="color: #666666">)</span> \
<span style="color: #666666">);</span> <span style="border: 1px solid \
#FF0000">}</span> </pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">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 <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">m_doc->url()</code> 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".</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>keduvocdocument/keduvockvtml2writer.cpp <span style="color: \
grey">(ff9c292)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/129992/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============7063975898997002962==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic