mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-21 03:55:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Request scan media on push

Browse source 
After a file is pushed, send a broadcast to request the media scanner to
scan the "push target" directory.

In practice, this allows some apps to detect the new file immediately.
This commit is contained in:
Romain Vimont 2021-06-13 22:32:36 +02:00
parent cda4aa1623
commit 190a90f45d
10 changed files with 118 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/control_msg.c
View file

@ -80,6 +80,13 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
case CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
buf[1] = msg->set_screen_power_mode.mode;
return 2;
case CONTROL_MSG_TYPE_SCAN_MEDIA:
{
size_t len = write_string(msg->scan_media.path,
CONTROL_MSG_SCAN_MEDIA_PATH_MAX_LENGTH,
&buf[1]);
return 1 + len;
}
case CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
case CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
case CONTROL_MSG_TYPE_COLLAPSE_PANELS:
@ -102,6 +109,9 @@ control_msg_destroy(struct control_msg *msg) {
case CONTROL_MSG_TYPE_SET_CLIPBOARD:
free(msg->set_clipboard.text);
break;
case CONTROL_MSG_TYPE_SCAN_MEDIA:
free(msg->scan_media.path);
break;
default:
// do nothing
break;

6
app/src/control_msg.h
View file

@ -17,6 +17,8 @@
// type: 1 byte; paste flag: 1 byte; length: 4 bytes
#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (CONTROL_MSG_MAX_SIZE - 6)
#define CONTROL_MSG_SCAN_MEDIA_PATH_MAX_LENGTH 256
#define POINTER_ID_MOUSE UINT64_C(-1);
#define POINTER_ID_VIRTUAL_FINGER UINT64_C(-2);
@ -33,6 +35,7 @@ enum control_msg_type {
CONTROL_MSG_TYPE_SET_CLIPBOARD,
CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
CONTROL_MSG_TYPE_ROTATE_DEVICE,
CONTROL_MSG_TYPE_SCAN_MEDIA,
};
enum screen_power_mode {
@ -76,6 +79,9 @@ struct control_msg {
struct {
enum screen_power_mode mode;
} set_screen_power_mode;
struct {
char *path; // owned, to be freed by free()
} scan_media;
};
};

26
app/src/file_handler.c
View file

@ -4,6 +4,8 @@
#include <string.h>
#include "adb.h"
#include "control_msg.h"
#include "controller.h"
#include "util/log.h"
#define DEFAULT_PUSH_TARGET "/sdcard/"
@ -14,7 +16,8 @@ file_handler_request_destroy(struct file_handler_request *req) {
}
bool
file_handler_init(struct file_handler *file_handler, const char *serial,
file_handler_init(struct file_handler *file_handler,
struct controller *controller, const char *serial,
const char *push_target) {
cbuf_init(&file_handler->queue);
@ -50,6 +53,8 @@ file_handler_init(struct file_handler *file_handler, const char *serial,
file_handler->push_target = push_target ? push_target : DEFAULT_PUSH_TARGET;
file_handler->controller = controller;
return true;
}
@ -103,6 +108,24 @@ file_handler_request(struct file_handler *file_handler,
return res;
}
static bool
request_scan_media(struct file_handler *file_handler) {
struct control_msg msg;
msg.type = CONTROL_MSG_TYPE_SCAN_MEDIA;
msg.scan_media.path = strdup(file_handler->push_target);
if (!msg.scan_media.path) {
LOGW("Could not strdup() media path");
return false;
}
if (!controller_push_msg(file_handler->controller, &msg)) {
LOGW("Could not request 'scan media'");
return false;
}
return true;
}
static int
run_file_handler(void *data) {
struct file_handler *file_handler = data;
@ -145,6 +168,7 @@ run_file_handler(void *data) {
if (process_check_success(process, "adb push", false)) {
LOGI("%s successfully pushed to %s", req.file,
file_handler->push_target);
request_scan_media(file_handler);
} else {
LOGE("Failed to push %s to %s", req.file,
file_handler->push_target);

4
app/src/file_handler.h
View file

@ -22,6 +22,7 @@ struct file_handler_request {
struct file_handler_request_queue CBUF(struct file_handler_request, 16);
struct file_handler {
struct controller *controller;
char *serial;
const char *push_target;
sc_thread thread;
@ -34,7 +35,8 @@ struct file_handler {
};
bool
file_handler_init(struct file_handler *file_handler, const char *serial,
file_handler_init(struct file_handler *file_handler,
struct controller *controller, const char *serial,
const char *push_target);
void

4
app/src/scrcpy.c
View file

@ -346,8 +346,8 @@ scrcpy(const struct scrcpy_options *options) {
}
controller_started = true;
if (!file_handler_init(&s->file_handler, s->server.serial,
options->push_target)) {
if (!file_handler_init(&s->file_handler, &s->controller,
s->server.serial, options->push_target)) {
goto end;
}
file_handler_initialized = true;

23
app/tests/test_control_msg_serialize.c
View file

@ -278,6 +278,28 @@ static void test_serialize_rotate_device(void) {
assert(!memcmp(buf, expected, sizeof(expected)));
}
static void test_serialize_scan_media(void) {
struct control_msg msg = {
.type = CONTROL_MSG_TYPE_SCAN_MEDIA,
.scan_media = {
.path = "/sdcard/Download/",
},
};
unsigned char buf[CONTROL_MSG_MAX_SIZE];
size_t size = control_msg_serialize(&msg, buf);
assert(size == 22);
const unsigned char expected[] = {
CONTROL_MSG_TYPE_SCAN_MEDIA,
0x00, 0x00, 0x00, 0x11, // path length
'/', 's', 'd', 'c', 'a', 'r', 'd', '/',
'D', 'o', 'w', 'n', 'l', 'o', 'a', 'd',
'/' // path
};
assert(!memcmp(buf, expected, sizeof(expected)));
}
int main(int argc, char *argv[]) {
(void) argc;
(void) argv;
@ -295,5 +317,6 @@ int main(int argc, char *argv[]) {
test_serialize_set_clipboard();
test_serialize_set_screen_power_mode();
test_serialize_rotate_device();
test_serialize_scan_media();
return 0;
}

8
server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
View file

@ -17,6 +17,7 @@ public final class ControlMessage {
public static final int TYPE_SET_CLIPBOARD = 9;
public static final int TYPE_SET_SCREEN_POWER_MODE = 10;
public static final int TYPE_ROTATE_DEVICE = 11;
public static final int TYPE_SCAN_MEDIA = 12;
private int type;
private String text;
@ -97,6 +98,13 @@ public final class ControlMessage {
return msg;
}
public static ControlMessage createScanMedia(String path) {
ControlMessage msg = new ControlMessage();
msg.type = TYPE_SCAN_MEDIA;
msg.text = path;
return msg;
}
public static ControlMessage createEmpty(int type) {
ControlMessage msg = new ControlMessage();
msg.type = type;

11
server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
View file

@ -76,6 +76,9 @@ public class ControlMessageReader {
case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
msg = parseSetScreenPowerMode();
break;
case ControlMessage.TYPE_SCAN_MEDIA:
msg = parseScanMedia();
break;
case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
case ControlMessage.TYPE_EXPAND_SETTINGS_PANEL:
case ControlMessage.TYPE_COLLAPSE_PANELS:
@ -182,6 +185,14 @@ public class ControlMessageReader {
return ControlMessage.createSetScreenPowerMode(mode);
}
private ControlMessage parseScanMedia() {
String path = parseString();
if (path == null) {
return null;
}
return ControlMessage.createScanMedia(path);
}
private static Position readPosition(ByteBuffer buffer) {
int x = buffer.getInt();
int y = buffer.getInt();

10
server/src/main/java/com/genymobile/scrcpy/Controller.java
View file

@ -1,5 +1,7 @@
package com.genymobile.scrcpy;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.SystemClock;
import android.view.InputDevice;
@ -7,6 +9,7 @@ import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.MotionEvent;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@ -135,6 +138,13 @@ public class Controller {
case ControlMessage.TYPE_ROTATE_DEVICE:
Device.rotateDevice();
break;
case ControlMessage.TYPE_SCAN_MEDIA:
String path = msg.getText();
@SuppressWarnings("deprecation")
Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
intent.setData(Uri.fromFile(new File(path)));
Device.sendBroadcast(intent);
break;
default:
// do nothing
}

20
server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
View file

@ -314,6 +314,26 @@ public class ControlMessageReaderTest {
Assert.assertEquals(ControlMessage.TYPE_ROTATE_DEVICE, event.getType());
}
@Test
public void testScanMedia() throws IOException {
ControlMessageReader reader = new ControlMessageReader();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_SCAN_MEDIA);
byte[] text = "/sdcard/Download/".getBytes(StandardCharsets.UTF_8);
dos.writeInt(text.length);
dos.write(text);
byte[] packet = bos.toByteArray();
reader.readFrom(new ByteArrayInputStream(packet));
ControlMessage event = reader.next();
Assert.assertEquals(ControlMessage.TYPE_SCAN_MEDIA, event.getType());
Assert.assertEquals("/sdcard/Download/", event.getText());
}
@Test
public void testMultiEvents() throws IOException {
ControlMessageReader reader = new ControlMessageReader();