fit-webview-bridge 0.2.1a3__tar.gz → 0.2.1a5__tar.gz

{fit_webview_bridge-0.2.1a3 → fit_webview_bridge-0.2.1a5}/PKG-INFO

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

{fit_webview_bridge-0.2.1a3 → fit_webview_bridge-0.2.1a5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fit-webview-bridge"
-version = "0.2.1a3"
+version = "0.2.1a5"
 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.1a3 → fit_webview_bridge-0.2.1a5}/src/macos/WKWebViewWidget.mm

@@ -45,13 +45,14 @@ static NSURL* toNSURL(QUrl u);
 }
 @end
 
-// =======================
-// Navigation + Download delegate
-// =======================
+// ===== WKNavDelegate =====
 @interface WKNavDelegate : NSObject <WKNavigationDelegate, WKDownloadDelegate>
 @property(nonatomic, assign) WKWebViewWidget* owner;
-// stato download (nel delegate, non toccare i privati del widget)
-@property(nonatomic, strong) NSMapTable<WKDownload*, NSString*>* downloadPaths;
+// mappe per download
+@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
 @end
 
 @implementation WKNavDelegate
@@ -59,6 +60,9 @@ static NSURL* toNSURL(QUrl u);
 - (instancetype)init {
     if ((self = [super init])) {
         _downloadPaths = [NSMapTable weakToStrongObjectsMapTable];
+        _progressToDownload = [NSMapTable weakToWeakObjectsMapTable];
+        _completedProgresses = [NSHashTable weakObjectsHashTable];
+        _expectedTotals = [NSMapTable weakToStrongObjectsMapTable];
     }
     return self;
 }
@@ -118,8 +122,7 @@ decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
     if (navigationResponse.canShowMIMEType) {
         decisionHandler(WKNavigationResponsePolicyAllow);
     } else {
-        // API moderna: "Download" (non BecomeDownload)
-        decisionHandler(WKNavigationResponsePolicyDownload);
+        decisionHandler(WKNavigationResponsePolicyDownload); // API moderna
     }
 }
 
@@ -130,10 +133,9 @@ navigationAction:(WKNavigationAction *)navigationAction
 didBecomeDownload:(WKDownload *)download
 {
     download.delegate = self;
-    if (self.owner) {
-        emit self.owner->downloadStarted(QString(), QString());
-    }
-   
+    if (self.owner) emit self.owner->downloadStarted(QString(), QString());
+
+    // KVO su NSProgress (3 keyPath, con INITIAL)
     [download.progress addObserver:self forKeyPath:@"fractionCompleted"
                            options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial)
                            context:NULL];
@@ -143,6 +145,8 @@ didBecomeDownload:(WKDownload *)download
     [download.progress addObserver:self forKeyPath:@"totalUnitCount"
                            options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial)
                            context:NULL];
+
+    [self.progressToDownload setObject:download forKey:download.progress];
 }
 
 - (void)webView:(WKWebView *)webView
@@ -153,10 +157,9 @@ didBecomeDownload:(WKDownload *)download
 
     NSString* suggested = navigationResponse.response.suggestedFilename ?: @"download";
     if (self.owner) {
-        QString destDir = self.owner->downloadDirectory();
-        QString destPath = destDir + "/" + QString::fromUtf8(suggested.UTF8String);
-        emit self.owner->downloadStarted(QString::fromUtf8(suggested.UTF8String),
-                                         destPath);
+        QString dir = self.owner->downloadDirectory();
+        QString path = dir + "/" + QString::fromUtf8(suggested.UTF8String);
+        emit self.owner->downloadStarted(QString::fromUtf8(suggested.UTF8String), path);
     }
 
     [download.progress addObserver:self forKeyPath:@"fractionCompleted"
@@ -168,6 +171,8 @@ didBecomeDownload:(WKDownload *)download
     [download.progress addObserver:self forKeyPath:@"totalUnitCount"
                            options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial)
                            context:NULL];
+
+    [self.progressToDownload setObject:download forKey:download.progress];
 }
 
 #pragma mark - Scegli destinazione
@@ -199,9 +204,7 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
 
     QString qdir = self.owner->downloadDirectory();
     NSString* dir = [NSString stringWithUTF8String:qdir.toUtf8().constData()];
-    if (!dir.length) {
-        dir = [NSHomeDirectory() stringByAppendingPathComponent:@"Downloads"];
-    }
+    if (!dir.length) dir = [NSHomeDirectory() stringByAppendingPathComponent:@"Downloads"];
 
     [[NSFileManager defaultManager] createDirectoryAtPath:dir
                               withIntermediateDirectories:YES
@@ -215,6 +218,16 @@ 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);
+        }
+    }
+
     completionHandler([NSURL fileURLWithPath:finalPath]);
 }
 
@@ -227,18 +240,32 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
         [super observeValueForKeyPath:keyPath ofObject:obj change:change context:ctx];
         return;
     }
-
     NSProgress* prog = (NSProgress*)obj;
-    int64_t total = prog.totalUnitCount;     // può essere -1 (sconosciuto)
+
+    // Calcolo grezzo fuori dal main
+    int64_t total = prog.totalUnitCount;     // -1 se sconosciuto
     int64_t done  = prog.completedUnitCount;
 
-    // Emetti SEMPRE su main (thread-safety Qt/UI)
+    // 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;
 
@@ -248,13 +275,14 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
         [download.progress removeObserver:self forKeyPath:@"totalUnitCount"];
     } @catch (...) {}
 
+    [self.completedProgresses addObject:download.progress];
+
+
     NSString* finalPath = [self.downloadPaths objectForKey:download];
-    if (finalPath) {
-        emit self.owner->downloadFinished(QString::fromUtf8(finalPath.UTF8String));
-        [self.downloadPaths removeObjectForKey:download];
-    } else {
-        emit self.owner->downloadFinished(QString());
-    }
+    emit self.owner->downloadFinished(finalPath ? QString::fromUtf8(finalPath.UTF8String) : QString());
+    if (finalPath) [self.downloadPaths removeObjectForKey:download];
+    [self.progressToDownload removeObjectForKey:download.progress];
+    [self.expectedTotals removeObjectForKey:download]; 
 }
 
 - (void)download:(WKDownload *)download didFailWithError:(NSError *)error resumeData:(NSData *)resumeData {
@@ -266,10 +294,16 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
         [download.progress removeObserver:self forKeyPath:@"totalUnitCount"];
     } @catch (...) {}
 
-   NSString* finalPath = [self.downloadPaths objectForKey:download];
-    QString qpath = finalPath ? QString::fromUtf8(finalPath.UTF8String) : QString();
-    emit self.owner->downloadFailed(qpath, QString::fromUtf8(error.localizedDescription.UTF8String));
+    [self.completedProgresses addObject:download.progress];
+
+    NSString* finalPath = [self.downloadPaths objectForKey:download];
+    emit self.owner->downloadFailed(
+        finalPath ? QString::fromUtf8(finalPath.UTF8String) : QString(),
+        QString::fromUtf8(error.localizedDescription.UTF8String)
+    );
     if (finalPath) [self.downloadPaths removeObjectForKey:download];
+    [self.progressToDownload removeObjectForKey:download.progress];
+    [self.expectedTotals removeObjectForKey:download]; 
 }
 
 @end