Merge pull request #36 from CCExtractor/sse-fix

Transfer rate fix

Author: pratikbaid3

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -52,6 +52,8 @@ PODS:
     - Flutter
   - SwiftyGif (5.4.0)
   - Toast (4.0.0)
+  - url_launcher (0.0.1):
+    - Flutter
   - video_player (0.0.1):
     - Flutter
   - wakelock (0.0.1):
@@ -66,6 +68,7 @@ DEPENDENCIES:
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
   - video_player (from `.symlinks/plugins/video_player/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
 
@@ -94,6 +97,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
+  url_launcher:
+    :path: ".symlinks/plugins/url_launcher/ios"
   video_player:
     :path: ".symlinks/plugins/video_player/ios"
   wakelock:
@@ -103,7 +108,7 @@ SPEC CHECKSUMS:
   DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   flutter_downloader: 058b9c41564a90500f67f3e432e3524613a7fd83
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
@@ -113,6 +118,7 @@ SPEC CHECKSUMS:
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   SwiftyGif: 5d4af95df24caf1c570dbbcb32a3b8a0763bc6d7
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
+  url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649
   video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
 

lib/Api/event_handler_api.dart

@@ -10,30 +10,17 @@ import 'package:json_patch/json_patch.dart';
 import 'package:provider/provider.dart';
 
 class EventHandlerApi {
-  //Sets the transfer rate if the event returned is TRANSFER_SUMMARY_DIFF_CHANGE
+  //Sets the transfer rate if the event returned is TRANSFER_SUMMARY_FULL_UPDATE
   static void setTransferRate({
     required SSEModel model,
     required BuildContext context,
   }) {
-    List<dynamic> data = json.decode(model.data ?? '');
-    if (data != []) {
-      String upSpeed = '0';
-      String downSpeed = '0';
-
-      List<RateModel> rateList = [];
-      for (var i in data) {
-        rateList.add(RateModel.fromJson(i));
-      }
-      for (RateModel model in rateList) {
-        if (model.path == '/downRate') {
-          downSpeed = filesize(model.value);
-        } else if (model.path == '/upRate') {
-          upSpeed = filesize(model.value);
-        }
-      }
-      Provider.of<HomeProvider>(context, listen: false)
-          .setSpeed(upSpeed, downSpeed);
-    }
+    dynamic data = json.decode(model.data ?? '');
+    RateModel rateModel = RateModel.fromJson(data);
+    String downSpeed = filesize(rateModel.downRate.toString());
+    String upSpeed = filesize(rateModel.upRate.toString());
+    Provider.of<HomeProvider>(context, listen: false)
+        .setSpeed(upSpeed, downSpeed);
   }
 
   //Getting full list of torrents

lib/Constants/event_names.dart

@@ -1,7 +1,7 @@
 class Events {
   //Transfer rate
-  static const String TRANSFER_SUMMARY_DIFF_CHANGE =
-      'TRANSFER_SUMMARY_DIFF_CHANGE';
+  static const String TRANSFER_SUMMARY_FULL_UPDATE =
+      'TRANSFER_SUMMARY_FULL_UPDATE';
 
   //Full list of torrents
   static const String TORRENT_LIST_FULL_UPDATE = 'TORRENT_LIST_FULL_UPDATE';

lib/Model/download_rate_model.dart

@@ -1,17 +1,21 @@
+import 'package:flutter/material.dart';
+
 class RateModel {
-  String op;
-  String path;
-  int value;
-  RateModel({
-    required this.value,
-    required this.op,
-    required this.path,
-  });
+  int downRate;
+  int downTotal;
+  int upRate;
+  int upTotal;
+  RateModel(
+      {required this.downRate,
+      required this.downTotal,
+      required this.upRate,
+      required this.upTotal});
   factory RateModel.fromJson(Map<String, dynamic> json) {
     return RateModel(
-      op: json['op'],
-      path: json['path'],
-      value: json['value'],
+      downTotal: json['downTotal'],
+      downRate: json['downRate'],
+      upTotal: json['upTotal'],
+      upRate: json['upRate'],
     );
   }
 }

lib/Provider/sse_provider.dart

@@ -21,12 +21,12 @@ class SSEProvider extends ChangeNotifier {
             Provider.of<UserDetailProvider>(context).token)
         .listen((event) {
       if (event.id != '' && event.data != '' && event.event != '') {
-        // print('Id: ' + event.id);
-        // print('Event: ' + event.event);
-        // print('Data: ' + event.data);
+        // print('Id: ' + event.id!);
+        // print('Event: ' + event.event!);
+        // print('Data: ' + event.data!);
         sseModel = event;
         switch (event.event) {
-          case Events.TRANSFER_SUMMARY_DIFF_CHANGE:
+          case Events.TRANSFER_SUMMARY_FULL_UPDATE:
             EventHandlerApi.setTransferRate(model: event, context: context);
             break;
           case Events.TORRENT_LIST_FULL_UPDATE:

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,10 +7,12 @@ import Foundation
 
 import path_provider_macos
 import shared_preferences_macos
+import url_launcher_macos
 import wakelock_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
 }