asgardius/s3music
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

get subpath

Browse source
This commit is contained in:
Page Asgardius 2022-12-30 17:37:47 -07:00
parent 9c45c4aaf0
commit 69dacae861
2 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
View file

@ -128,9 +128,6 @@ public class ObjectSelect extends AppCompatActivity {
if (filename.length == treelevel+1) { if (filename.length == treelevel+1) {
object.add(filename[treelevel]+"/"); object.add(filename[treelevel]+"/");
} }
else {
}
//i++; //i++;
} }
@ -142,9 +139,6 @@ public class ObjectSelect extends AppCompatActivity {
if (filename.length == treelevel+1) { if (filename.length == treelevel+1) {
object.add(filename[treelevel]+"/"); object.add(filename[treelevel]+"/");
} }
else {
}
//i++; //i++;
} }

41
app/src/main/java/asgardius/page/s3manager/Uploader.java
View file

@ -3,6 +3,7 @@ package asgardius.page.s3manager;
import static android.content.ContentValues.TAG; import static android.content.ContentValues.TAG;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.documentfile.provider.DocumentFile;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
@ -58,6 +59,7 @@ public class Uploader extends AppCompatActivity {
ProgressBar simpleProgressBar; ProgressBar simpleProgressBar;
long filesize; long filesize;
File ufile; File ufile;
DocumentFile document;
Intent intent; Intent intent;
Button fileUpload; Button fileUpload;
Thread uploadFile, uploadProgress; Thread uploadFile, uploadProgress;
@ -138,7 +140,46 @@ public class Uploader extends AppCompatActivity {
//s3client.createBucket(bucket, location); //s3client.createBucket(bucket, location);
//System.out.println(fkey); //System.out.println(fkey);
if (isfolder) { if (isfolder) {
document = DocumentFile.fromTreeUri(getApplicationContext(), fileuri);
DocumentFile[] filelist = document.listFiles();
ArrayList<String> filepath = new ArrayList<String>();
int treelevel = 0;
ArrayList<Integer> fileindex = new ArrayList<Integer>();
fileindex.add(0);
for (int i = 0; i < filelist.length; i++) {
filepath.add(filelist[i].getName());
if(filelist[i].isDirectory()) {
//Nothing for now //Nothing for now
treelevel++;
fileindex.add(0);
document = filelist[i];
filelist = document.listFiles();
while (treelevel >= 1 && fileindex.get(treelevel) < filelist.length) {
filepath.add(filelist[fileindex.get(treelevel)].getName());
System.out.println(String.join("/", filepath));
if(filelist[fileindex.get(treelevel)].length()%MAX_SINGLE_PART_UPLOAD_BYTES == 0) {
System.out.println((filelist[fileindex.get(treelevel)].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+" parts");
} else {
System.out.println(((filelist[fileindex.get(treelevel)].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+1)+" parts");
}
filepath.remove(treelevel);
fileindex.set(treelevel, fileindex.get(treelevel)+1);
}
document = document.getParentFile();
filelist = document.listFiles();
treelevel--;
} else {
System.out.println(String.join("/", filepath));
if(filelist[i].length()%MAX_SINGLE_PART_UPLOAD_BYTES == 0) {
System.out.println((filelist[i].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+" parts");
} else {
System.out.println(((filelist[i].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+1)+" parts");
}
}
filepath.clear();
fileindex.clear();
fileindex.add(0);
}
} else { } else {
ufile = readContentToFile(fileuri); ufile = readContentToFile(fileuri);
filesize = ufile.length(); filesize = ufile.length();