这是indexloc提供的服务，不要输入任何密码
Skip to content

TermuxFileReceiverActivity: Support dir import #2555

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

Closed
wants to merge 2 commits into from
Closed

TermuxFileReceiverActivity: Support dir import #2555

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5a52f6
Support directory import
Worldwidebrine Feb 2, 2022
9d80685
Merge branch 'master' into patch-2
Worldwidebrine Mar 12, 2022
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
72 changes: 72 additions & 0 deletions app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.provider.OpenableColumns;
import android.util.Patterns;

Expand All @@ -29,7 +30,13 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Iterator;
import java.util.regex.Pattern;
import java.util.stream.Stream;

public class TermuxFileReceiverActivity extends AppCompatActivity {

Expand Down Expand Up @@ -144,6 +151,24 @@ void handleContentUri(@NonNull final Uri uri, String subjectFromIntent) {
if (attachmentFileName == null) attachmentFileName = subjectFromIntent;
if (attachmentFileName == null) attachmentFileName = UriUtils.getUriFileBasename(uri, true);

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
ParcelFileDescriptor fileDescriptor = null;
try {
fileDescriptor = getContentResolver().openFileDescriptor(uri, "r");
int fd = fileDescriptor.getFd();
Path link = Paths.get("/proc/self/fd/" + fd);
if (Files.isDirectory(link)) {
promptNameAndCopy(link, fileDescriptor, attachmentFileName);
return;
}
} catch (Exception e) {
Logger.logStackTraceWithMessage(LOG_TAG, "handleContentUri(uri=" + uri + ") as directory failed (continuing as file)", e);
if (fileDescriptor != null) {
fileDescriptor.close();
}
}
}

InputStream in = getContentResolver().openInputStream(uri);
promptNameAndSave(in, attachmentFileName);
} catch (Exception e) {
Expand All @@ -152,6 +177,53 @@ void handleContentUri(@NonNull final Uri uri, String subjectFromIntent) {
}
}

@androidx.annotation.RequiresApi(api = android.os.Build.VERSION_CODES.O)
void promptNameAndCopy(final Path SOURCE, @NonNull final ParcelFileDescriptor fd, final String attachmentFileName) {
final TextInputDialogUtils.TextSetListener listener = (
text -> {
try (final ParcelFileDescriptor fileDescriptor = fd) {
if (DataUtils.isNullOrEmpty(text)) {
showErrorDialogAndQuit("File name cannot be null or empty");
return;
}
final Path receiveDir = Paths.get(TERMUX_RECEIVEDIR, text);
if (Files.createDirectories(receiveDir) != receiveDir) {
showErrorDialogAndQuit("Cannot create directory: " + receiveDir.toAbsolutePath().toString());
return;
}
try (Stream<Path> children = Files.list(SOURCE)) {
for (Iterator<Path> itr = children.iterator(); itr.hasNext();) {
Path child = itr.next();
try (Stream<Path> stream = Files.walk(child)) {
for (Iterator<Path> i = stream.iterator(); i.hasNext();) {
Path source = i.next();
Files.copy(source, receiveDir.resolve(SOURCE.relativize(source)), LinkOption.NOFOLLOW_LINKS);
}
}
}
}
fileDescriptor.getFd();

Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE);
executeIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, receiveDir.toString());
executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
startService(executeIntent);
finish();
} catch (Exception e) {
showErrorDialogAndQuit("Error copying directory:\n\n" + e);
Logger.logStackTraceWithMessage(LOG_TAG, "Error copying directory", e);
}
});
TextInputDialogUtils.textInput(this, R.string.title_file_received, attachmentFileName,
R.string.action_file_received_edit, listener,
R.string.action_file_received_open_directory, listener,
android.R.string.cancel, text -> finish(), dialog -> {
if (mFinishOnDismissNameDialog) {
finish();
}
});
}

void promptNameAndSave(final InputStream in, final String attachmentFileName) {
TextInputDialogUtils.textInput(this, R.string.title_file_received, attachmentFileName,
R.string.action_file_received_edit, text -> {
Expand Down