fit-webview-bridge 0.2.1a4__tar.gz → 0.2.2a2__tar.gz

{fit_webview_bridge-0.2.1a4 → fit_webview_bridge-0.2.2a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fit-webview-bridge
-Version: 0.2.1a4
+Version: 0.2.2a2
 Summary: Qt native WebView bridge with PySide6 bindings
 Author: FIT Project
 License: LGPL-3.0-or-later

{fit_webview_bridge-0.2.1a4 → fit_webview_bridge-0.2.2a2}/bindings/pyside6/macos/typesystem_wkwebview.xml

@@ -7,6 +7,9 @@
   <object-type name="WKWebViewWidget">
     <include file-name="WKWebViewWidget.h" location="global"/>
   </object-type>
+  <object-type name="DownloadInfo">
+    <include file-name="DownloadInfo.h" location="global"/>
+  </object-type>
 </typesystem>
 
 

{fit_webview_bridge-0.2.1a4 → fit_webview_bridge-0.2.2a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fit-webview-bridge"
-version = "0.2.1a4"
+version = "0.2.2a2"
 description = "Qt native WebView bridge with PySide6 bindings"
 requires-python = ">=3.11,<3.14"
 dependencies = ["PySide6==6.9.0", "shiboken6==6.9.0", "shiboken6-generator==6.9.0"]

{fit_webview_bridge-0.2.1a4 → fit_webview_bridge-0.2.2a2}/src/macos/CMakeLists.txt

@@ -28,6 +28,7 @@ file(CREATE_LINK "${QT_FRAMEWORKS_DIR}/QtWidgets.framework/Headers" "${QT_HDRSHI
 add_library(wkwebview STATIC
   WKWebViewWidget.mm
   WKWebViewWidget.h
+  DownloadInfo.h
 )
 target_compile_features(wkwebview PRIVATE cxx_std_17)
 

fit_webview_bridge-0.2.2a2/src/macos/DownloadInfo.h

@@ -0,0 +1,26 @@
+#pragma once
+#include <QObject>
+#include <QString>
+#include <QUrl>
+
+class DownloadInfo : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString downloadFileName READ downloadFileName CONSTANT)
+    Q_PROPERTY(QString downloadDirectory READ downloadDirectory CONSTANT)
+    Q_PROPERTY(QUrl    downloadUrl      READ downloadUrl      CONSTANT)
+public:
+    explicit DownloadInfo(const QString& fileName,
+                          const QString& directory,
+                          const QUrl& url,
+                          QObject* parent=nullptr)
+        : QObject(parent), m_fileName(fileName), m_directory(directory), m_url(url) {}
+
+    QString downloadFileName() const { return m_fileName; }
+    QString downloadDirectory() const { return m_directory; }
+    QUrl    downloadUrl()      const { return m_url; }
+
+private:
+    QString m_fileName;
+    QString m_directory;
+    QUrl    m_url;
+};

{fit_webview_bridge-0.2.1a4 → fit_webview_bridge-0.2.2a2}/src/macos/WKWebViewWidget.h

@@ -3,6 +3,8 @@
 #include <QObject>
 #include <QUrl>
 
+#include "DownloadInfo.h"
+
 class QString; class QShowEvent; class QResizeEvent;
 
 class WKWebViewWidget : public QWidget {
@@ -36,7 +38,7 @@ signals:
 
     void downloadStarted(const QString& suggestedFilename, const QString& destinationPath);
     void downloadProgress(qint64 bytesReceived, qint64 totalBytes);
-    void downloadFinished(const QString& filePath);
+    void downloadFinished(DownloadInfo* info);
     void downloadFailed(const QString& filePath, const QString& error);
 
 protected:

{fit_webview_bridge-0.2.1a4 → fit_webview_bridge-0.2.2a2}/src/macos/WKWebViewWidget.mm

@@ -2,6 +2,7 @@
 #import <WebKit/WebKit.h>
 
 #include "WKWebViewWidget.h"
+#include "DownloadInfo.h"
 
 #include <QtWidgets>
 #include <QString>
@@ -52,6 +53,9 @@ static NSURL* toNSURL(QUrl u);
 @property(nonatomic, strong) NSMapTable<WKDownload*, NSString*>* downloadPaths;   // weak key -> strong value
 @property(nonatomic, strong) NSMapTable<NSProgress*, WKDownload*>* progressToDownload; // weak->weak
 @property(nonatomic, strong) NSHashTable<NSProgress*>* completedProgresses;      // weak set
+@property(nonatomic, strong) NSMapTable<WKDownload*, NSNumber*>* expectedTotals; // weak->strong
+@property(nonatomic, strong) NSMapTable<WKDownload*, NSURL*>*     sourceURLs;      // weak->strong
+@property(nonatomic, strong) NSMapTable<WKDownload*, NSString*>*  suggestedNames;  // weak->strong
 @end
 
 @implementation WKNavDelegate
@@ -61,6 +65,9 @@ static NSURL* toNSURL(QUrl u);
         _downloadPaths = [NSMapTable weakToStrongObjectsMapTable];
         _progressToDownload = [NSMapTable weakToWeakObjectsMapTable];
         _completedProgresses = [NSHashTable weakObjectsHashTable];
+        _expectedTotals = [NSMapTable weakToStrongObjectsMapTable];
+        _sourceURLs     = [NSMapTable weakToStrongObjectsMapTable];
+        _suggestedNames = [NSMapTable weakToStrongObjectsMapTable];
     }
     return self;
 }
@@ -131,6 +138,12 @@ navigationAction:(WKNavigationAction *)navigationAction
 didBecomeDownload:(WKDownload *)download
 {
     download.delegate = self;
+
+    // URL sorgente (request dell’azione)
+    if (navigationAction.request.URL) {
+        [self.sourceURLs setObject:navigationAction.request.URL forKey:download];
+    }
+
     if (self.owner) emit self.owner->downloadStarted(QString(), QString());
 
     // KVO su NSProgress (3 keyPath, con INITIAL)
@@ -153,6 +166,10 @@ didBecomeDownload:(WKDownload *)download
 {
     download.delegate = self;
 
+    if (navigationResponse.response.URL) {
+        [self.sourceURLs setObject:navigationResponse.response.URL forKey:download];
+    }
+
     NSString* suggested = navigationResponse.response.suggestedFilename ?: @"download";
     if (self.owner) {
         QString dir = self.owner->downloadDirectory();
@@ -216,6 +233,22 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
         QString::fromUtf8(finalPath.UTF8String)
     );
 
+    // Leggi il Content-Length se disponibile e salvalo
+    long long expected = response.expectedContentLength; // -1 se sconosciuto
+    if (expected >= 0) {
+        [self.expectedTotals setObject:@(expected) forKey:download];
+        if (self.owner) {
+            // progress iniziale (0 di total)
+            emit self.owner->downloadProgress(0, expected);
+        }
+    }
+
+    if (suggestedFilename) {
+    [self.suggestedNames setObject:suggestedFilename forKey:download];
+    } else if (![self.suggestedNames objectForKey:download]) {
+        [self.suggestedNames setObject:@"download" forKey:download];
+    }
+
     completionHandler([NSURL fileURLWithPath:finalPath]);
 }
 
@@ -230,54 +263,95 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
     }
     NSProgress* prog = (NSProgress*)obj;
 
-    // ignora aggiornamenti dopo il completamento
-    if ([self.completedProgresses containsObject:prog]) return;
-
+    // Calcolo grezzo fuori dal main
     int64_t total = prog.totalUnitCount;     // -1 se sconosciuto
     int64_t done  = prog.completedUnitCount;
 
+    // Dispatch su main, ma **ricontrolla** lo stato "completed" dentro al blocco
+   // DOPO (compatibile MRC)
+    __unsafe_unretained WKNavDelegate* weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
-        emit self.owner->downloadProgress(done, (total >= 0 ? total : -1));
+        WKNavDelegate* strongSelf = weakSelf;
+        if (!strongSelf || !strongSelf.owner) return;
+
+        // blocca update tardivi dopo finished/failed
+        if ([strongSelf.completedProgresses containsObject:prog]) return;
+
+        WKDownload* dl = [strongSelf.progressToDownload objectForKey:prog];
+        NSNumber* exp = dl ? [strongSelf.expectedTotals objectForKey:dl] : nil;
+
+        int64_t totalEff = (total >= 0 ? total : (exp ? exp.longLongValue : -1));
+        emit strongSelf.owner->downloadProgress(done, totalEff);
     });
+
+
 }
 
 - (void)downloadDidFinish:(WKDownload *)download {
     if (!self.owner) return;
 
+    // 1) stop KVO
     @try {
         [download.progress removeObserver:self forKeyPath:@"fractionCompleted"];
         [download.progress removeObserver:self forKeyPath:@"completedUnitCount"];
         [download.progress removeObserver:self forKeyPath:@"totalUnitCount"];
     } @catch (...) {}
 
+    // 2) marca come completato per filtrare update tardivi
     [self.completedProgresses addObject:download.progress];
 
+    // 3) raccogli dati
     NSString* finalPath = [self.downloadPaths objectForKey:download];
-    emit self.owner->downloadFinished(finalPath ? QString::fromUtf8(finalPath.UTF8String) : QString());
+    NSString* fname = [self.suggestedNames objectForKey:download];
+    if (!fname && finalPath) fname = [finalPath lastPathComponent];
+    NSString* dir = finalPath ? [finalPath stringByDeletingLastPathComponent] : nil;
+    NSURL* src = [self.sourceURLs objectForKey:download];
+
+    // 4) crea DownloadInfo* e emetti
+    QString qFileName = fname ? QString::fromUtf8(fname.UTF8String) : QString();
+    QString qDir      = dir   ? QString::fromUtf8(dir.UTF8String)   : QString();
+    QUrl    qUrl      = src   ? QUrl::fromEncoded(QByteArray(src.absoluteString.UTF8String))
+                              : QUrl();
+
+    DownloadInfo* info = new DownloadInfo(qFileName, qDir, qUrl, self.owner);
+    emit self.owner->downloadFinished(info);
+
+    // 5) cleanup mappe
     if (finalPath) [self.downloadPaths removeObjectForKey:download];
     [self.progressToDownload removeObjectForKey:download.progress];
+    [self.expectedTotals removeObjectForKey:download];
+    [self.sourceURLs removeObjectForKey:download];
+    [self.suggestedNames removeObjectForKey:download];
 }
 
+
 - (void)download:(WKDownload *)download didFailWithError:(NSError *)error resumeData:(NSData *)resumeData {
     if (!self.owner) return;
 
+    // stop KVO
     @try {
         [download.progress removeObserver:self forKeyPath:@"fractionCompleted"];
         [download.progress removeObserver:self forKeyPath:@"completedUnitCount"];
         [download.progress removeObserver:self forKeyPath:@"totalUnitCount"];
     } @catch (...) {}
-
     [self.completedProgresses addObject:download.progress];
 
+    // path (se già deciso)
     NSString* finalPath = [self.downloadPaths objectForKey:download];
     emit self.owner->downloadFailed(
         finalPath ? QString::fromUtf8(finalPath.UTF8String) : QString(),
         QString::fromUtf8(error.localizedDescription.UTF8String)
     );
+
+    // cleanup mappe
     if (finalPath) [self.downloadPaths removeObjectForKey:download];
     [self.progressToDownload removeObjectForKey:download.progress];
+    [self.expectedTotals removeObjectForKey:download];
+    [self.sourceURLs removeObjectForKey:download];
+    [self.suggestedNames removeObjectForKey:download];
 }
 
+
 @end
 
 // =======================