Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/unzip after downloading v2 #3

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix/unzip after downloading v2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7163fe
Unzip when complete - > Add James Morton PR updates to this repo
AugustGit Feb 22, 2023
e5cb571
rename
AugustGit Feb 22, 2023
913681a
fix typo
AugustGit Feb 23, 2023
a8808c6
add && self.bridge
AugustGit Feb 23, 2023
f11c825
update react-native version
AugustGit Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 85 additions & 0 deletions android/src/main/java/com/eko/RNBackgroundDownloaderModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.eko;

import android.annotation.SuppressLint;
import android.os.AsyncTask;
import android.util.Log;


import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
Expand Down Expand Up @@ -31,8 +33,10 @@

import org.jetbrains.annotations.NotNull;

import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
Expand All @@ -41,6 +45,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

import javax.annotation.Nullable;

Expand Down Expand Up @@ -343,6 +349,49 @@ public void onCompleted(Download download) {
params.putString("location", config.destination);

ee.emit("downloadComplete", params);
final String filePath = download.getFile();
final String taskId = config.id;
Log.d(getName(), "success callback!");

new Thread(new Runnable() {
@Override
public void run() {
try {
File downloadedZipFile = new File(filePath);
Log.d(getName(), "About to unzip: " + filePath + " (" + downloadedZipFile.exists() + ")");

File tempZipFile = new File(filePath + "_todelete");
if (tempZipFile.exists()) {
boolean deleteResult = tempZipFile.delete();

if (!deleteResult) {
throw new Exception("File not deleted");
}
}
boolean renameResult = downloadedZipFile.renameTo(tempZipFile);
if (!renameResult) {
throw new Exception("File not renamed");
}
unzip(tempZipFile, downloadedZipFile);
boolean deleteResult = tempZipFile.delete();

if (!deleteResult) {
Log.d(getName(), "Temp zip file not deleted");
}

WritableMap params = Arguments.createMap();
params.putString("id", taskId);
ee.emit("downloadComplete", params);
} catch(Exception e) {
e.printStackTrace();

WritableMap params = Arguments.createMap();
params.putString("id", taskId);
params.putInt("errorcode", -1);
ee.emit("downloadFailed", params);
}
}
}).start();
}

removeFromMaps(download.getId());
Expand Down Expand Up @@ -484,4 +533,40 @@ public void onDownloadBlockUpdated(Download download, DownloadBlock downloadBloc
@Override
public void onStarted(Download download, List<? extends DownloadBlock> list, int i) {
}


private void unzip(File zipFile, File targetDirectory) throws IOException {
ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(zipFile)));

try {
ZipEntry ze;
int count;
byte[] buffer = new byte[8192];

while ((ze = zis.getNextEntry()) != null) {
File file = new File(targetDirectory, ze.getName());
File dir = ze.isDirectory() ? file : file.getParentFile();

if (!dir.isDirectory() && !dir.mkdirs()) {
throw new FileNotFoundException("Failed to ensure directory: " + dir.getAbsolutePath());
}

if (ze.isDirectory()) {
continue;
}

FileOutputStream fout = new FileOutputStream(file);

try {
while ((count = zis.read(buffer)) != -1) {
fout.write(buffer, 0, count);
}
} finally {
fout.close();
}
}
} finally {
zis.close();
}
}
}
51 changes: 31 additions & 20 deletions ios/RNBackgroundDownloader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
//
#import "RNBackgroundDownloader.h"
#import "RNBGDTaskConfig.h"
#import "SSZipArchive.h"

#define ID_TO_CONFIG_MAP_KEY @"com.eko.bgdownloadidmap"

Expand Down Expand Up @@ -328,14 +329,24 @@ - (void)URLSession:(nonnull NSURLSession *)session downloadTask:(nonnull NSURLSe
if (error == nil) {
[self saveDownloadedFile:taskConfig downloadURL:location error:&error];
}
if (self.bridge) {
if (error == nil) {
NSDictionary *responseHeaders = ((NSHTTPURLResponse *)downloadTask.response).allHeaderFields;
[self sendEventWithName:@"downloadComplete" body:@{@"id": taskConfig.id, @"headers": responseHeaders, @"location": taskConfig.destination}];
} else {
[self sendEventWithName:@"downloadFailed" body:@{@"id": taskConfig.id, @"error": [error localizedDescription]}];
// if (self.bridge) {
// if (error == nil) {
// NSDictionary *responseHeaders = ((NSHTTPURLResponse *)downloadTask.response).allHeaderFields;
// [self sendEventWithName:@"downloadComplete" body:@{@"id": taskConfig.id, @"headers": responseHeaders, @"location": taskConfig.destination}];
// } else {
// [self sendEventWithName:@"downloadFailed" body:@{@"id": taskConfig.id, @"error": [error localizedDescription]}];
// }
// }
[SSZipArchive unzipFileAtPath:location.path toDestination:taskConfig.destination progressHandler:^(NSString *entry, unz_file_info zipInfo, long entryNumber, long total) {
} completionHandler:^(NSString *path, BOOL succeeded, NSError * _Nullable error) {
if (self.bridge) {
if (succeeded && error == nil) {
[self sendEventWithName:@"downloadComplete" body:@{@"id": taskConfig.id}];
} else {
[self sendEventWithName:@"downloadFailed" body:@{@"id": taskConfig.id, @"error": [error localizedDescription]}];
}
}
}
}];
[self removeTaskFromMap:downloadTask];
}
}
Expand All @@ -348,26 +359,26 @@ - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTas
- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite {
NSLog(@"[RNBackgroundDownloader] - [didWriteData]");
@synchronized (sharedLock) {
RNBGDTaskConfig *taskCofig = taskToConfigMap[@(downloadTask.taskIdentifier)];
if (taskCofig != nil) {
// NSLog(@"[RNBackgroundDownloader] - [didWriteData] destination - %@", taskCofig.destination);
if (!taskCofig.reportedBegin) {
RNBGDTaskConfig *taskConfig = taskToConfigMap[@(downloadTask.taskIdentifier)];
if (taskConfig != nil) {
// NSLog(@"[RNBackgroundDownloader] - [didWriteData] destination - %@", taskConfig.destination);
if (!taskConfig.reportedBegin && self.bridge) {
NSDictionary *responseHeaders = ((NSHTTPURLResponse *)downloadTask.response).allHeaderFields;
if (self.bridge) {
[self sendEventWithName:@"downloadBegin" body:@{
@"id": taskCofig.id,
@"id": taskConfig.id,
@"expectedBytes": [NSNumber numberWithLongLong: totalBytesExpectedToWrite],
@"headers": responseHeaders
}];
}
taskCofig.reportedBegin = YES;
taskConfig.reportedBegin = YES;
}

NSNumber *prevPercent = idToPercentMap[taskCofig.id];
NSNumber *prevPercent = idToPercentMap[taskConfig.id];
NSNumber *percent = [NSNumber numberWithFloat:(float)totalBytesWritten/(float)totalBytesExpectedToWrite];
if ([percent floatValue] - [prevPercent floatValue] > 0.01f) {
progressReports[taskCofig.id] = @{@"id": taskCofig.id, @"written": [NSNumber numberWithLongLong: totalBytesWritten], @"total": [NSNumber numberWithLongLong: totalBytesExpectedToWrite], @"percent": percent};
idToPercentMap[taskCofig.id] = percent;
progressReports[taskConfig.id] = @{@"id": taskConfig.id, @"written": [NSNumber numberWithLongLong: totalBytesWritten], @"total": [NSNumber numberWithLongLong: totalBytesExpectedToWrite], @"percent": percent};
idToPercentMap[taskConfig.id] = percent;
}

NSDate *now = [[NSDate alloc] init];
Expand All @@ -388,12 +399,12 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
if (error == nil)
return;

RNBGDTaskConfig *taskCofig = taskToConfigMap[@(task.taskIdentifier)];
if (taskCofig == nil)
RNBGDTaskConfig *taskConfig = taskToConfigMap[@(task.taskIdentifier)];
if (taskConfig == nil)
return;

if (self.bridge) {
[self sendEventWithName:@"downloadFailed" body:@{@"id": taskCofig.id, @"error": [error localizedDescription]}];
[self sendEventWithName:@"downloadFailed" body:@{@"id": taskConfig.id, @"error": [error localizedDescription]}];
}
// IF WE CAN'T RESUME TO DOWNLOAD LATER
if (error.userInfo[NSURLSessionDownloadTaskResumeData] == nil) {
Expand Down Expand Up @@ -427,4 +438,4 @@ - (id)deserialize: (NSData *)data {
return [NSKeyedUnarchiver unarchiveObjectWithData:data];
}

@end
@end
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"lint-staged": ">=13",
"metro-react-native-babel-preset": "^0.74.1",
"react": "18.2.0",
"react-native": "0.71.1",
"react-native": "0.71.2",
"react-native-fs": "^2.20.0",
"react-native-vector-icons": "^9.2.0",
"react-test-renderer": "18.2.0"
Expand Down
1 change: 1 addition & 0 deletions react-native-background-downloader.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Pod::Spec.new do |s|
s.requires_arc = true

s.dependency 'React-Core'
s.dependency 'SSZipArchive', '2.2.3'
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried updating this to 2.4.3 but it still did not work and the higher versions are limited on what os they run

end
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6795,10 +6795,10 @@ react-native-fs@^2.20.0:
base-64 "^0.1.0"
utf8 "^3.0.0"

react-native-gradle-plugin@^0.71.13:
version "0.71.13"
resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.13.tgz#6f60ff24ac712554903dfc0ae98475cb280c57a6"
integrity sha512-C66LNZAXbU0YDRkWx8d/8kjesdu7fsUAc/3QPJNftSXKEvEtnFZK2aH/rIgu1s5dbTcE0fjhdVPNJMRIfKo61w==
react-native-gradle-plugin@^0.71.14:
version "0.71.15"
resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.15.tgz#9e6b506f30729fe8eb086981702f4e3c891d2b13"
integrity sha512-7S3pAuPaQJlhax6EZ4JMsDNpj05TfuzX9gPgWLrFfAIWIFLuJ6aDQYAZy2TEI9QJALPoWrj8LWaqP/DGYh14pw==

react-native-vector-icons@^9.2.0:
version "9.2.0"
Expand All @@ -6808,10 +6808,10 @@ react-native-vector-icons@^9.2.0:
prop-types "^15.7.2"
yargs "^16.1.1"

[email protected].1:
version "0.71.1"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.1.tgz#72b45af2b29e3d5a660c63425ab5003bf2112f99"
integrity sha512-bLP5+IBj2IX6tgF9WnC/UL2ZPYkVUPsU4xqZV1jntTC2TH4xyLrvfKACjGlz5nQ3Mx4BmOFqsnMxithm53+6Aw==
[email protected].2:
version "0.71.2"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.2.tgz#b6977eda2a6dc10baa006bf4ab1ee08318607ce9"
integrity sha512-ZSianM+j+09LoEdVIhrAP/uP8sQhT7dH6olCqM2xlpxmfCgA5NubsK6NABIuZiBlmmqjigyijm5Y/GhBIHDvEg==
dependencies:
"@jest/create-cache-key-function" "^29.2.1"
"@react-native-community/cli" "10.1.3"
Expand All @@ -6838,7 +6838,7 @@ [email protected]:
promise "^8.3.0"
react-devtools-core "^4.26.1"
react-native-codegen "^0.71.3"
react-native-gradle-plugin "^0.71.13"
react-native-gradle-plugin "^0.71.14"
react-refresh "^0.4.0"
react-shallow-renderer "^16.15.0"
regenerator-runtime "^0.13.2"
Expand Down