Merge branch 'staged' into dev

xiaoyifang · Jun 8, 2022 · 7820146 · 7820146
2 parents b2e9728 + 0e4e7af
commit 7820146
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 5 deletions.
diff --git a/article_netmgr.cc b/article_netmgr.cc
@@ -8,6 +8,7 @@
 #include "gddebug.hh"
 #include "utils.hh"
 #include <QNetworkAccessManager>
+#include "globalbroadcaster.h"
 
 using std::string;
 
@@ -249,11 +250,23 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co
 }
 
 sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
-  QUrl const & url, QString & contentType )
+  QUrl const & resUrl, QString & contentType )
 {
-  GD_DPRINTF( "getResource: %ls", url.toString().toStdWString().c_str() );
-  GD_DPRINTF( "scheme: %ls", url.scheme().toStdWString().c_str() );
-  GD_DPRINTF( "host: %ls", url.host().toStdWString().c_str() );
+  GD_DPRINTF( "getResource: %ls", resUrl.toString().toStdWString().c_str() );
+  GD_DPRINTF( "scheme: %ls", resUrl.scheme().toStdWString().c_str() );
+  GD_DPRINTF( "host: %ls", resUrl.host().toStdWString().c_str() );
+
+  QUrl url = resUrl;
+  if( url.scheme() == "bword" || url.scheme() == "entry" )
+  {
+    url.setScheme( "gdlookup" );
+    url.setHost( "localhost" );
+    url.setPath( "" );
+    auto [ valid, word ] = Utils::Url::getQueryWord( resUrl );
+    Utils::Url::addQueryItem( url, "word", word );
+    Utils::Url::addQueryItem( url, "group", QString::number( GlobalBroadcaster::instance()->getGroupId() ) );
+    Utils::Url::addQueryItem( url, "muted", GlobalBroadcaster::instance()->mutedDicts );
+  }
 
   if ( url.scheme() == "gdlookup" )
   {

diff --git a/articleview.cc b/articleview.cc
@@ -435,6 +435,8 @@ void ArticleView::showDefinition( Config::InputPhrase const & phrase, unsigned g
   if ( mutedDicts.size() )
     Utils::Url::addQueryItem( req,  "muted", mutedDicts );
 
+  GlobalBroadcaster::instance()->mutedDicts = mutedDicts;
+
   // Update both histories (pages history and headwords history)
   saveHistoryUserData();
   emit sendWordToHistory( phrase.phrase );

diff --git a/globalbroadcaster.cpp b/globalbroadcaster.cpp
@@ -29,4 +29,12 @@ void GlobalBroadcaster::addWhitelist(QString url){
 bool GlobalBroadcaster::existedInWhitelist(QString url){
   return std::find(whitelist.begin(), whitelist.end(), url) != whitelist.end();
 }
+
+void GlobalBroadcaster::setGroupId(unsigned groupId){
+  this->groupId = groupId;
+}
+
+unsigned GlobalBroadcaster::getGroupId(){
+  return groupId;
+}
 // namespace global
diff --git a/globalbroadcaster.h b/globalbroadcaster.h
@@ -17,13 +17,22 @@ class GlobalBroadcaster : public QObject
 private:
   Config::Preferences * preference;
   std::vector<QString> whitelist;
+  unsigned groupId;
+
+
 public:
   void setPreference( Config::Preferences * _pre );
   Config::Preferences * getPreference();
   GlobalBroadcaster( QObject * parent = nullptr );
   void addWhitelist(QString host);
   bool existedInWhitelist(QString host);
   static GlobalBroadcaster * instance();
+
+  //store the latest groupId;
+  void setGroupId(unsigned groupId);
+  unsigned getGroupId();
+
+  QString mutedDicts;
 signals:
   void dictionaryChanges( ActiveDictIds ad );
 };

diff --git a/mainwindow.cc b/mainwindow.cc
@@ -1417,6 +1417,9 @@ void MainWindow::updateGroupList()
 
   groupList->fill( groupInstances );
   groupList->setCurrentGroup( cfg.lastMainGroupId );
+
+  GlobalBroadcaster::instance()->setGroupId( cfg.lastMainGroupId);
+
   updateCurrentGroupProperty();
 
   updateDictionaryBar();
@@ -2305,6 +2308,9 @@ void MainWindow::updateCurrentGroupProperty()
   Instances::Group * grp =
       groupInstances.findGroup( groupList->getCurrentGroup() );
 
+  //record the latest groupid
+  GlobalBroadcaster::instance()->setGroupId(groupList->getCurrentGroup());
+
   if ( grp && translateLine->property( "currentGroup" ).toString() !=
        grp->name )
   {

diff --git a/resources/gd-custom.js b/resources/gd-custom.js
@@ -6,6 +6,11 @@ $(function() {
             if ('string' != typeof(link)) {
                 return;
             }
+
+            if(link.indexOf("javascript:")>=0){
+                return;
+            }
+
             if(link.indexOf(":")>=0){
                 emitClickedEvent(link);
                 return false;

diff --git a/utils.hh b/utils.hh
@@ -231,7 +231,9 @@ inline std::pair< bool, QString > getQueryWord( QUrl const & url )
     {
       //url,bword://localhost/word
       if( path.startsWith( "/" ) )
-        word = url.path().mid( 1 );
+        word = path.mid( 1 );
+      else
+        word = path;
     }
     else
     {