opt: rewrite the logic of determine the existence of audio link (#1860)

* opt: rewrite the logic of determine the existence of audio link



---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

src/audiolink.cc

@@ -11,40 +11,9 @@ std::string addAudioLink( std::string const & url, std::string const & dictionar
 
 std::string addAudioLink( QString const & url, std::string const & dictionaryId )
 {
-  if ( url.isEmpty() || url.length() < 2 ) {
+  if ( url.isEmpty() ) {
     return {};
   }
-  GlobalBroadcaster::instance()->pronounce_engine.sendAudio( dictionaryId, url.mid( 1, url.length() - 2 ) );
+  GlobalBroadcaster::instance()->pronounce_engine.sendAudio( dictionaryId, url );
-
+  return "";
-  return std::string( "<script type=\"text/javascript\">" + makeAudioLinkScript( url.toStdString(), dictionaryId )
-                      + "</script>" );
-}
-
-std::string makeAudioLinkScript( std::string const & url, std::string const & dictionaryId )
-{
-  /// Convert "'" to "\'" - this char broke autoplay of audiolinks
-
-  std::string ref;
-  bool escaped = false;
-  for ( const char ch : url ) {
-    if ( escaped ) {
-      ref += ch;
-      escaped = false;
-      continue;
-    }
-    if ( ch == '\'' ) {
-      ref += '\\';
-    }
-    ref += ch;
-    escaped = ( ch == '\\' );
-  }
-
-  const std::string audioLinkForDict = QString::fromStdString( R"(
-if(!gdAudioMap.has('%1')){
-    gdAudioMap.set('%1',%2);
-}
-)" )
-                                         .arg( QString::fromStdString( dictionaryId ), QString::fromStdString( url ) )
-                                         .toStdString();
-  return "gdAudioLinks.first = gdAudioLinks.first || " + ref + ";" + audioLinkForDict;
 }

src/audiolink.hh

@@ -15,6 +15,5 @@
 /// The dictionary id is used to make active dictionary feature work.
 std::string addAudioLink( std::string const & url, std::string const & dictionaryId );
 std::string addAudioLink( QString const & url, std::string const & dictionaryId );
-std::string makeAudioLinkScript( std::string const & url, std::string const & dictionaryId );
 
 #endif

src/dict/dsl.cc

@@ -861,7 +861,7 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
 
       string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-      result += addAudioLink( ref, getId() );
+      result += addAudioLink( url.toEncoded(), getId() );
 
       result += "<span class=\"dsl_s_wav\"><a href=" + ref
         + R"(><img src="qrc:///icons/playsound.png" border="0" align="absmiddle" alt="Play"/></a></span>)";

src/dict/epwing_book.cc

@@ -1569,7 +1569,7 @@ QByteArray EpwingBook::handleWave( EB_Hook_Code code, const unsigned int * argv
   url.setPath( Utils::Url::ensureLeadingSlash( name ) );
 
   string ref        = string( "\"" ) + url.toEncoded().data() + "\"";
-  QByteArray result = addAudioLink( ref, dictID.toUtf8().data() ).c_str();
+  QByteArray result = addAudioLink( url.toEncoded(), dictID.toUtf8().data() ).c_str();
 
   result += QByteArray( "<span class=\"epwing_wav\"><a href=" ) + ref.c_str() + ">";
 

src/dict/forvo.cc

@@ -260,7 +260,7 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 
                 string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-                articleBody += addAudioLink( ref, dictionaryId ).c_str();
+                articleBody += addAudioLink( url.toEncoded(), dictionaryId ).c_str();
 
                 bool isMale = ( item.namedItem( "sex" ).toElement().text().toLower() != "f" );
 

src/dict/gls.cc

@@ -789,9 +789,11 @@ QString & GlsDictionary::filterResource( QString & article )
       articleNewText += match.captured();
     }
     else {
-      std::string href = "\"gdau://" + getId() + "/" + src.toUtf8().data() + "\"";
+      std::string audioLink = "gdau://" + getId() + "/" + src.toUtf8().data();
+      std::string href      = "\"" + audioLink + "\"";
+
       QString newTag = QString::fromUtf8(
-        ( addAudioLink( href, getId() ) + "<span class=\"gls_wav\"><a href=" + href + ">" ).c_str() );
+        ( addAudioLink( audioLink, getId() ) + "<span class=\"gls_wav\"><a href=" + href + ">" ).c_str() );
       newTag += match.captured( 4 );
       if ( match.captured( 4 ).indexOf( "<img " ) < 0 ) {
         newTag += R"( <img src="qrc:///icons/playsound.png" border="0" alt="Play">)";

src/dict/lingualibre.cc

@@ -357,7 +357,7 @@ void LinguaArticleRequest::requestFinished( QNetworkReply * r )
       string title     = pageJsonObj[ "title" ].toString().toHtmlEscaped().toStdString();
       string audiolink =
         pageJsonObj[ "imageinfo" ].toArray().at( 0 ).toObject()[ "url" ].toString().toHtmlEscaped().toStdString();
-      articleBody += addAudioLink( "\"" + audiolink + "\"", dictionaryId );
+      articleBody += addAudioLink( audiolink, dictionaryId );
       articleBody += R"(<a href=")";
       articleBody += audiolink;
       articleBody += R"(">)";

src/dict/lsa.cc

@@ -277,7 +277,7 @@ sptr< Dictionary::DataRequest > LsaDictionary::getArticle( wstring const & word,
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-    result += addAudioLink( ref, getId() );
+    result += addAudioLink( url.toEncoded(), getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
     result += "<td><a href=" + ref + ">" + i->second + "</a></td>";
@@ -294,7 +294,7 @@ sptr< Dictionary::DataRequest > LsaDictionary::getArticle( wstring const & word,
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-    result += addAudioLink( ref, getId() );
+    result += addAudioLink( url.toEncoded(), getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
     result += "<td><a href=" + ref + ">" + i->second + "</a></td>";

src/dict/mdx.cc

@@ -922,9 +922,8 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
         // sounds and audio link script
         QString newTxt = match.captured( 1 ) + match.captured( 2 ) + "gdau://" + id + "/" + match.captured( 3 )
           + match.captured( 2 ) + R"( onclick="return false;" )";
-        newLink =
+        newLink = QString::fromUtf8(
-          QString::fromUtf8(
+                    addAudioLink( "gdau://" + getId() + "/" + match.captured( 3 ).toUtf8().data(), getId() ).c_str() )
-            addAudioLink( "\"gdau://" + getId() + "/" + match.captured( 3 ).toUtf8().data() + "\"", getId() ).c_str() )
           + newLink.replace( match.capturedStart(), match.capturedLength(), newTxt );
       }
 

src/dict/mediawiki.cc

@@ -608,7 +608,7 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
                 if ( ref.startsWith( "//" ) ) {
                   ref = wikiUrl.scheme() + ":" + ref;
                 }
-                auto script       = addAudioLink( "\"" + ref + "\"", this->dictPtr->getId() );
+                auto script       = addAudioLink( ref, this->dictPtr->getId() );
                 QString audio_url = QString::fromStdString( script ) + "<a href=\"" + ref
                   + R"("><img src="qrc:///icons/playsound.png" border="0" align="absmiddle" alt="Play"/></a>)";
                 articleNewString += audio_url;

src/dict/programs.cc

@@ -95,7 +95,7 @@ ProgramsDictionary::getArticle( wstring const & word, vector< wstring > const &,
 
       string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-      result += addAudioLink( ref, getId() );
+      result += addAudioLink( url.toEncoded(), getId() );
 
       result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
       result += "<td><a href=" + ref + ">" + Html::escape( wordUtf8 ) + "</a></td>";

src/dict/sounddir.cc

@@ -229,7 +229,7 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getArticle( wstring const &
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-    result += addAudioLink( ref, getId() );
+    result += addAudioLink( url.toEncoded(), getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
     result += "<td><a href=" + ref + ">" + _displayName + "</a></td>";
@@ -277,7 +277,7 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getArticle( wstring const &
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-    result += addAudioLink( ref, getId() );
+    result += addAudioLink( url.toEncoded(), getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
     result += "<td><a href=" + ref + ">" + _displayName + "</a></td>";

src/dict/stardict.cc

@@ -543,8 +543,9 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
           articleNewText += match.captured();
         }
         else {
-          std::string href   = "\"gdau://" + getId() + "/" + src.toUtf8().data() + "\"";
+          std::string audioLink = "gdau://" + getId() + "/" + src.toUtf8().data();
-          std::string newTag = addAudioLink( href, getId() ) + "<span class=\"sdict_h_wav\"><a href=" + href + ">";
+          std::string href      = "\"" + audioLink + "\"";
+          std::string newTag = addAudioLink( audioLink, getId() ) + "<span class=\"sdict_h_wav\"><a href=" + href + ">";
           newTag += match.captured( 4 ).toUtf8().constData();
           if ( match.captured( 4 ).indexOf( "<img " ) < 0 ) {
             newTag += R"( <img src="qrc:///icons/playsound.png" border="0" alt="Play">)";

src/dict/voiceengines.cc

@@ -98,7 +98,7 @@ VoiceEnginesDictionary::getArticle( wstring const & word, vector< wstring > cons
 
   string encodedUrl = url.toEncoded().data();
   string ref        = string( "\"" ) + encodedUrl + "\"";
-  result += addAudioLink( ref, getId() );
+  result += addAudioLink( encodedUrl, getId() );
 
   result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
   result += "<td><a href=" + ref + ">" + Html::escape( wordUtf8 ) + "</a></td>";

src/dict/xdxf2html.cc

@@ -661,9 +661,7 @@ string convert( string const & in,
           el_script.setAttribute( "type", "text/javascript" );
           parent.replaceChild( el_script, el );
 
-          QDomText el_txt = dd.createTextNode(
+          addAudioLink( string( "\"" ) + url.toEncoded().data() + "\"", dictPtr->getId() );
-            makeAudioLinkScript( string( "\"" ) + url.toEncoded().data() + "\"", dictPtr->getId() ).c_str() );
-          el_script.appendChild( el_txt );
 
           QDomElement el_span = dd.createElement( "span" );
           el_span.setAttribute( "class", "xdxf_wav" );

src/dict/zipsounds.cc

@@ -263,7 +263,7 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-    result += addAudioLink( ref, getId() );
+    result += addAudioLink( url.toEncoded(), getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
     result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";
@@ -305,7 +305,7 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
-    result += addAudioLink( ref, getId() );
+    result += addAudioLink( url.toEncoded(), getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
     result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";

src/pronounceengine.cc

@@ -8,7 +8,6 @@ PronounceEngine::PronounceEngine( QObject * parent ):
 {
 }
 
-
 void PronounceEngine::reset()
 {
   QMutexLocker _( &mutex );
@@ -48,6 +47,7 @@ void PronounceEngine::finishDictionary( std::string dictId )
       }
       state = PronounceState::OCCUPIED;
     }
-    emit emitAudio( dictAudioMap[ dictId ].first() );
+    auto link = dictAudioMap[ dictId ].first();
+    emit emitAudio( link );
   }
 }

src/scripts/gd-builtin.js

@@ -1,12 +1,3 @@
-// seperate from cpp code.
-var gdAudioLinks = {
-  first: null,
-  current: null,
-};
-
-//store dictionary audio link.
-var gdAudioMap = new Map();
-
 function gdMakeArticleActive(newId, noEvent) {
   const gdCurrentArticle =
     document.querySelector(".gdactivearticle").attributes.id;
@@ -16,7 +7,6 @@ function gdMakeArticleActive(newId, noEvent) {
       .classList.remove("gdactivearticle");
     const newFormId = "gdfrom-" + newId;
     document.querySelector(`#${newFormId}`).classList.add("gdactivearticle");
-    gdAudioLinks.current = newId;
     if (!noEvent) articleview.onJsActiveArticleChanged("gdfrom-" + newId);
   }
 }

src/ui/articleview.cc

@@ -277,6 +277,16 @@ unsigned ArticleView::getCurrentGroupId()
   return currentGroupId;
 }
 
+void ArticleView::setAudioLink( QString audioLink )
+{
+  audioLink_ = audioLink;
+}
+
+QString ArticleView::getAudioLink() const
+{
+  return audioLink_;
+}
+
 ArticleView::~ArticleView()
 {
   cleanupTemp();
@@ -302,6 +312,7 @@ void ArticleView::showDefinition( QString const & word,
   currentActiveDictIds.clear();
   // first, let's stop the player
   audioPlayer->stop();
+  audioLink_.clear();
 
   QUrl req;
   Contexts contexts( contexts_ );
@@ -376,6 +387,7 @@ void ArticleView::showDefinition( QString const & word,
   currentActiveDictIds.clear();
   // first, let's stop the player
   audioPlayer->stop();
+  audioLink_.clear();
 
   QUrl req;
 
@@ -1306,33 +1318,14 @@ void ArticleView::reload()
 
 void ArticleView::hasSound( const std::function< void( bool ) > & callback )
 {
-  webview->page()->runJavaScript( R"(if(typeof(gdAudioLinks)!="undefined") gdAudioLinks.first)",
+  callback( !audioLink_.isEmpty() );
-                                  [ callback ]( const QVariant & v ) {
-                                    bool has = false;
-                                    if ( v.type() == QVariant::String ) {
-                                      has = !v.toString().isEmpty();
-                                    }
-                                    callback( has );
-                                  } );
 }
 
-//use webengine javascript to playsound
 void ArticleView::playSound()
 {
-  QString variable = R"( (function(){  var link=gdAudioMap.get(gdAudioLinks.current);           
+  if ( !audioLink_.isEmpty() ) {
-       if(link==undefined){           
+    playAudio( QUrl::fromEncoded( audioLink_.toUtf8() ) );
-           link=gdAudioLinks.first;           
   }
-        return link;})();         )";
-
-  webview->page()->runJavaScript( variable, [ this ]( const QVariant & result ) {
-    if ( result.typeId() == qMetaTypeId< QString >() ) {
-      QString soundScript = result.toString();
-      if ( !soundScript.isEmpty() ) {
-        openLink( QUrl::fromEncoded( soundScript.toUtf8() ), webview->url() );
-      }
-    }
-  } );
 }
 
 void ArticleView::stopSound()

src/ui/articleview.hh

@@ -71,6 +71,8 @@ class ArticleView: public QWidget
   //current active dictionary id;
   QString activeDictId;
 
+  QString audioLink_;
+
   /// Search in results of full-text search
   QString firstAvailableText;
   QStringList uniqueMatches;
@@ -99,6 +101,9 @@ public:
   void setCurrentGroupId( unsigned currengGrgId );
   unsigned getCurrentGroupId();
 
+  void setAudioLink( QString audioLink );
+  QString getAudioLink() const;
+
   virtual QSize minimumSizeHint() const;
   void clearContent();
 

src/ui/mainwindow.cc

@@ -717,10 +717,11 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
            &PronounceEngine::emitAudio,
            this,
            [ this ]( auto audioUrl ) {
+             auto view = getCurrentArticleView();
+             view->setAudioLink( audioUrl );
              if ( !isActiveWindow() ) {
                return;
              }
-             auto view = getCurrentArticleView();
              if ( ( cfg.preferences.pronounceOnLoadMain ) && view != nullptr ) {
 
                view->playAudio( QUrl::fromEncoded( audioUrl.toUtf8() ) );

src/ui/scanpopup.cc

@@ -165,6 +165,7 @@ ScanPopup::ScanPopup( QWidget * parent,
            &PronounceEngine::emitAudio,
            this,
            [ this ]( auto audioUrl ) {
+             definition->setAudioLink( audioUrl );
              if ( !isActiveWindow() ) {
                return;
              }