Merge branch 'staged' into dev

.github/workflows/macos-homebrew-PR-check.yml

@@ -49,16 +49,12 @@ jobs:
        
       - name: install deps on macos
         run: |
-          brew install pcre2 harfbuzz freetype
-          brew install cmake ninja python
+          brew install cmake ninja
           brew install automake
           brew install autoconf
           brew install libtool
           brew install opencc
           
-          # brew install speex
-          # brew tap homebrew-ffmpeg/ffmpeg
-          # brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex
           brew install libao
           brew install libiconv
           brew install lzo bzip2
@@ -69,7 +65,6 @@ jobs:
           wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2
           tar xvjf eb-4.4.3.tar.bz2
           cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd ..
-          #brew install qt # or use official offline installer
           brew install  xz lzo 
           brew install pkg-config
           brew install libiconv

.github/workflows/macos-homebrew-breakpad.yml

@@ -42,20 +42,15 @@ jobs:
        
       - name: install deps on macos
         run: |
-          brew install pcre2 harfbuzz freetype
-          brew install cmake ninja python
+          brew install cmake ninja
           brew install automake
           brew install autoconf
           brew install libtool
           brew install opencc
           brew install speex
           brew install wavpack
           brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
-          brew install speex
           
-          brew tap homebrew-ffmpeg/ffmpeg
-          brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex
-
           brew install libiconv
           brew install lzo bzip2
           brew install libogg
@@ -105,7 +100,7 @@ jobs:
 
       - name: compile
         run: |          
-          qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian CONFIG+=use_breakpad
+          qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian CONFIG+=use_breakpad  CONFIG+=no_ffmpeg_player CONFIG+=no_tts_support
           make -j8
           
       - name: package

.github/workflows/macos-homebrew.yml

@@ -41,20 +41,12 @@ jobs:
        
       - name: install deps on macos
         run: |
-          brew install pcre2 harfbuzz freetype
-          brew install cmake ninja python
+          brew install cmake ninja
           brew install automake
           brew install autoconf
           brew install libtool
           brew install opencc
-          # brew install speex
-          brew install wavpack
           brew install automake git lame libass libtool shtool texi2html theora wget xvid nasm
-          # brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
-          
-          # brew tap homebrew-ffmpeg/ffmpeg
-          # brew options homebrew-ffmpeg/ffmpeg/ffmpeg 
-          # brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex
 
           brew install libiconv
           brew install lzo bzip2
@@ -76,8 +68,8 @@ jobs:
           cmake -B build -DCMAKE_BUILD_TYPE=release
           cmake --build build --config release
           sudo make install
-          find /usr/local -name libzstd.1.dylib 
-          find /usr/local -name liblzma.5.dylib
+          # find /usr/local -name libzstd.1.dylib 
+          # find /usr/local -name liblzma.5.dylib
       - name: version-file
         shell: bash
         env:

.github/workflows/windows.yml

@@ -3,21 +3,16 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
-  # workflow_run:
-  #   workflows: [AutoTag]
-  #   types: [completed]
   workflow_dispatch:
-  push:
-    branches:
-      - dev
-      - master
-      # - staged
-    paths-ignore:
-      - 'docs/**'
-      # - ".github/**"
-      - "howto/**"
-      - "*.md"
-      - ".clang-format"      
+  # push:
+  #   branches:
+  #     - dev
+  #     - master
+  #   paths-ignore:
+  #     - 'docs/**'
+  #     - "howto/**"
+  #     - "*.md"
+  #     - ".clang-format"      
 
 jobs:
   build:

resources.qrc

@@ -1,6 +1,8 @@
 <RCC>
     <qresource prefix="/">
         <file>icons/add-anki-icon.svg</file>
+        <file>icons/document.png</file>
+        <file>icons/audio.png</file>
         <file>version.txt</file>
         <file>icons/arrow.png</file>
         <file>icons/prefix.png</file>

src/article_maker.cc

@@ -156,7 +156,7 @@ body { background: #242525; }
 .gdarticle { background: initial;}
 
 .gdarticlebody img{
-  background: white;
+  background: white !important;
 }
 </style>
 <script>
@@ -444,9 +444,8 @@ string ArticleMaker::makeEmptyPageHtml() const
 
 sptr< Dictionary::DataRequest > ArticleMaker::makePicturePage( string const & url ) const
 {
-  string const result = makeHtmlHeader( tr( "(picture)" ), QString(), true )
-    + R"lit(<a href="javascript: if(history.length>2) history.go(-1)">)lit" + R"(<img src=")" + url + R"(" /></a>)"
-    + "</body></html>";
+  string const result =
+    makeHtmlHeader( tr( "(picture)" ), QString(), true ) + R"(<img src=")" + url + R"(" />)" + "</body></html>";
 
   sptr< Dictionary::DataRequestInstant > r = std::make_shared< Dictionary::DataRequestInstant >( true );
 

src/article_netmgr.cc

@@ -62,45 +62,7 @@ AllowFrameReply::AllowFrameReply( QNetworkReply * _reply ):
 
 void AllowFrameReply::applyMetaData()
 {
-  // Set raw headers except X-Frame-Options
-  QList< QByteArray > rawHeaders = baseReply->rawHeaderList();
-  for ( QList< QByteArray >::iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it ) {
-    auto headerName = it->toLower();
-    if ( headerName != "x-frame-options" && headerName != "content-security-policy" )
-      setRawHeader( *it, baseReply->rawHeader( *it ) );
-  }
-
-  // Set known headers
-  setHeader( QNetworkRequest::ContentDispositionHeader,
-             baseReply->header( QNetworkRequest::ContentDispositionHeader ) );
-  setHeader( QNetworkRequest::ContentTypeHeader, baseReply->header( QNetworkRequest::ContentTypeHeader ) );
-  setHeader( QNetworkRequest::ContentLengthHeader, baseReply->header( QNetworkRequest::ContentLengthHeader ) );
-  setHeader( QNetworkRequest::LocationHeader, baseReply->header( QNetworkRequest::LocationHeader ) );
-  setHeader( QNetworkRequest::LastModifiedHeader, baseReply->header( QNetworkRequest::LastModifiedHeader ) );
-  setHeader( QNetworkRequest::CookieHeader, baseReply->header( QNetworkRequest::CookieHeader ) );
-  setHeader( QNetworkRequest::SetCookieHeader, baseReply->header( QNetworkRequest::SetCookieHeader ) );
-  setHeader( QNetworkRequest::UserAgentHeader, baseReply->header( QNetworkRequest::UserAgentHeader ) );
-  setHeader( QNetworkRequest::ServerHeader, baseReply->header( QNetworkRequest::ServerHeader ) );
-
-  // Set attributes
-  setAttribute( QNetworkRequest::HttpStatusCodeAttribute,
-                baseReply->attribute( QNetworkRequest::HttpStatusCodeAttribute ) );
-  setAttribute( QNetworkRequest::HttpReasonPhraseAttribute,
-                baseReply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ) );
-  setAttribute( QNetworkRequest::RedirectionTargetAttribute,
-                baseReply->attribute( QNetworkRequest::RedirectionTargetAttribute ) );
-  setAttribute( QNetworkRequest::ConnectionEncryptedAttribute,
-                baseReply->attribute( QNetworkRequest::ConnectionEncryptedAttribute ) );
-  setAttribute( QNetworkRequest::SourceIsFromCacheAttribute,
-                baseReply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ) );
-  setAttribute( QNetworkRequest::HttpPipeliningWasUsedAttribute,
-                baseReply->attribute( QNetworkRequest::HttpPipeliningWasUsedAttribute ) );
-  setAttribute( QNetworkRequest::BackgroundRequestAttribute,
-                baseReply->attribute( QNetworkRequest::BackgroundRequestAttribute ) );
-  setAttribute( QNetworkRequest::Http2WasUsedAttribute,
-                baseReply->attribute( QNetworkRequest::Http2WasUsedAttribute ) );
-
-  emit metaDataChanged();
+  // The webengine does not support to customize the headers right now ,maybe until Qt6.7 there should be some api supports
 }
 
 void AllowFrameReply::setReadBufferSize( qint64 size )
@@ -135,29 +97,14 @@ void AllowFrameReply::finishedSlot()
 
 QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest const & req )
 {
-  QUrl url;
-  auto op = GetOperation;
-
   if ( req.url().scheme() == "qrcx" ) {
-    // We had to override the local load policy for the qrc URL scheme until QWebSecurityOrigin::addLocalScheme() was
-    // introduced in Qt 4.6. Hence we used a custom qrcx URL scheme and redirected it here back to qrc. Qt versions
-    // older than 4.6 are no longer supported, so GoldenDict itself no longer uses the qrcx scheme. However, qrcx has
-    // been used for many years in our built-in article styles, and so may appear in user-defined article styles.
-    // TODO: deprecate (print a warning or show a warning message box) and eventually remove support for the obsolete
-    // qrcx URL scheme. A recent commit "Add support for qrc:// URL scheme" is the first one where the qrc scheme
-    // works correctly. So the deprecation has to wait until older GoldenDict versions become rarely used.
-    QUrl newUrl( req.url() );
-
-    newUrl.setScheme( "qrc" );
-    newUrl.setHost( "" );
-
-    QNetworkRequest newReq( req );
-    newReq.setUrl( newUrl );
-
-    return QNetworkAccessManager::createRequest( op, newReq, nullptr );
+    // Do not support qrcx which is the custom define protocol.
+    return new BlockedNetworkReply( this );
   }
 
-  url                 = req.url();
+  auto op = GetOperation;
+
+  QUrl url            = req.url();
   QMimeType mineType  = db.mimeTypeForUrl( url );
   QString contentType = mineType.name();
 
@@ -345,13 +292,6 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource( QUrl c
     }
   }
 
-  if ( url.scheme() == "gdpicture" ) {
-    contentType = "text/html";
-    QUrl imgUrl( url );
-    imgUrl.setScheme( "bres" );
-    return articleMaker.makePicturePage( imgUrl.toEncoded().data() );
-  }
-
   return sptr< Dictionary::DataRequest >();
 }
 
@@ -418,11 +358,12 @@ qint64 ArticleResourceReply::bytesAvailable() const
   if ( avail < 0 )
     return 0;
 
-  if ( !req->isFinished() ) {
-    return 65536;
+  qint64 availBytes = avail - alreadyRead + QNetworkReply::bytesAvailable();
+  if ( availBytes == 0 && !req->isFinished() ) {
+    return 10240;
   }
 
-  return avail - alreadyRead + QNetworkReply::bytesAvailable();
+  return availBytes;
 }
 
 

src/common/globalregex.cc

@@ -24,7 +24,8 @@ QRegularExpression Ftx::token( R"((".*?")|([\w\W\+\-]+))",
                                  | QRegularExpression::CaseInsensitiveOption );
 //mdx
 
-QRegularExpression Mdx::allLinksRe( R"((?:<\s*(a(?:rea)?|img|link|script|source)(?:\s+[^>]+|\s*)>))",
+//<audio src="xxx"> is also a valid url.
+QRegularExpression Mdx::allLinksRe( R"((?:<\s*(a(?:rea)?|img|link|script|source|audio|video)(?:\s+[^>]+|\s*)>))",
                                     QRegularExpression::CaseInsensitiveOption );
 QRegularExpression Mdx::wordCrossLink( R"(([\s"']href\s*=)\s*(["'])entry://([^>#]*?)((?:#[^>]*?)?)\2)",
                                        QRegularExpression::CaseInsensitiveOption );

src/config.cc

@@ -1160,9 +1160,6 @@ Class load()
   if ( !root.namedItem( "editDictionaryCommandLine" ).isNull() )
     c.editDictionaryCommandLine = root.namedItem( "editDictionaryCommandLine" ).toElement().text();
 
-  if ( !root.namedItem( "maxPictureWidth" ).isNull() )
-    c.maxPictureWidth = root.namedItem( "maxPictureWidth" ).toElement().text().toInt();
-
   if ( !root.namedItem( "maxHeadwordSize" ).isNull() ) {
     unsigned int value = root.namedItem( "maxHeadwordSize" ).toElement().text().toUInt();
     if ( value != 0 ) // 0 is invalid value for our purposes
@@ -2172,10 +2169,6 @@ void save( Class const & c )
     opt.appendChild( dd.createTextNode( c.editDictionaryCommandLine ) );
     root.appendChild( opt );
 
-    opt = dd.createElement( "maxPictureWidth" );
-    opt.appendChild( dd.createTextNode( QString::number( c.maxPictureWidth ) ) );
-    root.appendChild( opt );
-
     opt = dd.createElement( "maxHeadwordSize" );
     opt.appendChild( dd.createTextNode( QString::number( c.maxHeadwordSize ) ) );
     root.appendChild( opt );

src/config.hh

@@ -881,8 +881,6 @@ struct Class
 
   bool usingSmallIconsInToolbars;
 
-  int maxPictureWidth; // Maximum picture width
-
   /// Maximum size for the headwords.
   /// Bigger headwords won't be indexed. For now, only in DSL.
   unsigned int maxHeadwordSize;
@@ -899,7 +897,6 @@ struct Class
     pinPopupWindow( false ),
     showingDictBarNames( false ),
     usingSmallIconsInToolbars( false ),
-    maxPictureWidth( 0 ),
     maxHeadwordSize( 256U ),
     maxHeadwordsToExpand( 0 )
   {