(libviolet/downloader) Implements downloader ffi

project-violet · Jul 26, 2020 · 76fa296 · 76fa296
1 parent c20d207
commit 76fa296
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 32 deletions.
diff --git a/assets/libviolet/arm64-v8a/libviolet.so b/assets/libviolet/arm64-v8a/libviolet.so
diff --git a/assets/libviolet/armeabi-v7a/libviolet.so b/assets/libviolet/armeabi-v7a/libviolet.so
diff --git a/assets/libviolet/x86/libviolet.so b/assets/libviolet/x86/libviolet.so
diff --git a/assets/libviolet/x86_64/libviolet.so b/assets/libviolet/x86_64/libviolet.so
diff --git a/lib/pages/download/builtin_downloader.dart b/lib/pages/download/builtin_downloader.dart
@@ -14,7 +14,7 @@ import 'package:violet/component/downloadable.dart' as violetd;
 
 class BuiltinDownloader {
   static const int maxDownloadCount = 2;
-  static const int maxDownloadFileCount = 24;
+  static const int maxDownloadFileCount = 8;
 
   int _curDownloadCount = 0;
   int _curDonwloadFileCount = 0;

diff --git a/lib/pages/download/download_item_widget.dart b/lib/pages/download/download_item_widget.dart
@@ -167,7 +167,8 @@ class _DownloadItemWidgetState extends State<DownloadItemWidget> {
       }
 
       // Download
-      var _timer = new Timer.periodic(Duration(seconds: 1), (Timer timer) {
+      var _timer =
+          new Timer.periodic(Duration(milliseconds: 100), (Timer timer) {
         setState(() {
           if (downloadSec / 1024 < 500.0)
             downloadSpeed = (downloadSec / 1024).toStringAsFixed(1) + " KB/S";
@@ -212,7 +213,7 @@ class _DownloadItemWidgetState extends State<DownloadItemWidget> {
       }
       _timer.cancel();
 
-      await (await BuiltinDownloader.getInstance()).returnDownload();
+      // await (await BuiltinDownloader.getInstance()).returnDownload();
 
       // Postprocess
 
@@ -338,9 +339,9 @@ class _DownloadItemWidgetState extends State<DownloadItemWidget> {
         break;
 
       case 3:
-        state =
-            '[$downloadedFileCount/$downloadTotalFileCount] ($downloadSpeed ${(download / 1024.0 / 1024.0).toStringAsFixed(1)} MB)';
-        // state = '[$downloadedFileCount/$downloadTotalFileCount]';
+        // state =
+        //     '[$downloadedFileCount/$downloadTotalFileCount] ($downloadSpeed ${(download / 1024.0 / 1024.0).toStringAsFixed(1)} MB)';
+        state = '[$downloadedFileCount/$downloadTotalFileCount]';
         pp = Translations.instance.trans('progress') + ': ';
         break;
 

diff --git a/lib/pages/download/native_downloader.dart b/lib/pages/download/native_downloader.dart
@@ -10,6 +10,7 @@ import 'package:device_info/device_info.dart';
 import 'package:ffi/ffi.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:synchronized/synchronized.dart' as sync;
 import 'package:path_provider/path_provider.dart';
 import 'package:violet/component/downloadable.dart';
 
@@ -30,18 +31,18 @@ class NativeDownloadTask {
 
   NativeDownloadTask({this.id, this.url, this.fullpath, this.header});
 
-  static NativeDownloadTask fromDownloadTask(DownloadTask task) {
+  static NativeDownloadTask fromDownloadTask(int taskId, DownloadTask task) {
     var header = Map<String, String>();
-    header['referer'] = task.referer;
-    header['accept'] = task.accept;
-    header['user-agent'] = task.userAgent;
+    if (task.referer != null) header['referer'] = task.referer;
+    if (task.accept != null) header['accept'] = task.accept;
+    if (task.userAgent != null) header['user-agent'] = task.userAgent;
     if (task.headers != null) {
       task.headers.entries.forEach((element) {
         header[element.key.toLowerCase()] = element.value;
       });
     }
     return NativeDownloadTask(
-      id: task.taskId,
+      id: taskId,
       url: task.url,
       fullpath: task.downloadPath,
       header: header,
@@ -50,7 +51,7 @@ class NativeDownloadTask {
 
   String toString() {
     return jsonEncode({
-      "id": 1,
+      "id": id,
       "url": url,
       "fullpath": fullpath,
       "header": header,
@@ -64,6 +65,9 @@ class NativeDownloader {
   DownloaderDispose downloaderDispose;
   DownloaderStatus downloaderStatus;
   DownloaderAppend downloaderAppend;
+  List<DownloadTask> downloadTasks = List<DownloadTask>();
+
+  sync.Lock lock = sync.Lock();
 
   Future<void> init() async {
     final soPath = await _checkSharedLibrary();
@@ -85,7 +89,7 @@ class NativeDownloader {
         .lookup<NativeFunction<downloader_append>>("downloader_append")
         .asFunction();
 
-    downloaderInit(8);
+    downloaderInit(32);
   }
 
   static NativeDownloader _instance;
@@ -98,16 +102,46 @@ class NativeDownloader {
     return _instance;
   }
 
-  void addTask(DownloadTask task) {
-    downloaderAppend(
-        Utf8.toUtf8(NativeDownloadTask.fromDownloadTask(task).toString()));
+  NativeDownloader() {
+    Future.delayed(Duration(seconds: 1)).then((value) async {
+      // int prev = 0;
+      while (true) {
+        var x = Utf8.fromUtf8(downloaderStatus());
+        // var y = int.parse(x.split('|')[2]);
+        // print(x + '       ' + ((y - prev) / 1024.0).toString() + ' KB/S');
+        // prev = y;
+        var ll = x.split('|');
+        if (ll.length == 5) {
+          var complete = ll.last.split(',');
+          complete.forEach((element) {
+            int v = int.tryParse(element);
+            if (v != null) {
+              downloadTasks[v].completeCallback();
+            }
+          });
+        }
+        await Future.delayed(Duration(milliseconds: 100));
+      }
+    });
   }
 
-  void addTasks(List<DownloadTask> tasks) {
-    tasks.forEach((task) {
-      // print(NativeDownloadTask.fromDownloadTask(task).toString());
-      downloaderAppend(
-          Utf8.toUtf8(NativeDownloadTask.fromDownloadTask(task).toString()));
+  Future<void> addTask(DownloadTask task) async {
+    await lock.synchronized(() {
+      downloadTasks.add(task);
+      downloaderAppend(Utf8.toUtf8(
+          NativeDownloadTask.fromDownloadTask(downloadTasks.length, task)
+              .toString()));
+    });
+  }
+
+  Future<void> addTasks(List<DownloadTask> tasks) async {
+    await lock.synchronized(() {
+      tasks.forEach((task) {
+        downloadTasks.add(task);
+        downloaderAppend(Utf8.toUtf8(
+            NativeDownloadTask.fromDownloadTask(downloadTasks.length - 1, task)
+                .toString()));
+      });
     });
   }
 

diff --git a/libviolet/src/main.rs b/libviolet/src/main.rs
@@ -88,17 +88,29 @@ pub extern fn downloader_dispose() {
 
 #[no_mangle]
 pub extern fn downloader_status() -> *mut c_char {
-  let completed: String = DOWNLOAD_COMPLETE_INFO.clone().lock().unwrap().iter().enumerate().fold(String::new(), |res, (i, ch)| {
-      res + &format!("{},", ch)
-  });
-
-  CString::new(format!("{}|{}|{}|{}|{}", 
-    DOWNLOAD_TOTAL_COUNT.load(Ordering::SeqCst), 
-    DOWNLOAD_COMPLETED_COUNT.load(Ordering::SeqCst), 
-    DOWNLOADED_BYTES.load(Ordering::SeqCst), 
-    DOWNLOAD_ERROR_COUNT.load(Ordering::SeqCst),
-    completed
-  )).unwrap().into_raw()
+  let clone = DOWNLOAD_COMPLETE_INFO.clone();
+  let mut complete = clone.lock().unwrap();
+
+  if complete.len() == 0 {
+    return CString::new(format!("{}|{}|{}|{}", 
+      DOWNLOAD_TOTAL_COUNT.load(Ordering::SeqCst), 
+      DOWNLOAD_COMPLETED_COUNT.load(Ordering::SeqCst), 
+      DOWNLOADED_BYTES.load(Ordering::SeqCst), 
+      DOWNLOAD_ERROR_COUNT.load(Ordering::SeqCst),
+    )).unwrap().into_raw()
+  } else {
+    let completed: String = complete.iter().enumerate().fold(String::new(), |res, (_i, ch)| {
+        res + &format!("{},", ch)
+    });
+    complete.clear();
+    return CString::new(format!("{}|{}|{}|{}|{}", 
+      DOWNLOAD_TOTAL_COUNT.load(Ordering::SeqCst), 
+      DOWNLOAD_COMPLETED_COUNT.load(Ordering::SeqCst), 
+      DOWNLOADED_BYTES.load(Ordering::SeqCst), 
+      DOWNLOAD_ERROR_COUNT.load(Ordering::SeqCst),
+      completed
+    )).unwrap().into_raw();
+  }
 }
 
 #[no_mangle]