pull fails when passed a filename with a space in it

[cobaltdr]

Hello.

Thank you for continuing this project.

Is there a correct way of passing a path in a string to the pull method that it correctly finds the file? At the moment passing a string like "/storage/emulated/0/Download/Check-in confirmation.pdf" causes a file not found error.

Thank you in advance.

[cobaltdr]

Passing the same string to adb pull in a subprocess.run call works. It also has issues dealing with folders with a space in the name. Tested on the following file this time "/storage/emulated/0/Download/preview (1).pdf". Escaping the space character does not work.

A bit more investigating:

ppadb/device.py has:
res = self.shell(f"[ -f {src} ] && echo {file_string}") which fails because src is not quoted in the shell.

changing it to:
res = self.shell(f"[ -f \"{src}\" ] && echo {file_string}") works, ie it correctly detects the file as a valid file.

Same would work for the checking if it is a directory. Have done a pull request on those two changes, but I'm not sure it worked.

[edit]

This was breaking when passing a directory name, have rewritten part of it, pull now looks like this:

    def pull(self, src, dest):
        src = PurePosixPath(src)
        dest = Path(dest)
       
        dir_string = "IS_DIR"
        res = self.shell(f"[ -d \"{src}\" ] && echo {dir_string}")
        if dir_string in res:
            # Get all files in the dir
            # Pull each
            dest.mkdir(exist_ok=True)
            cmd = f"find \"{src}\" -maxdepth 1 -printf '%f\n'"
            res = self.shell(cmd)
            contents_list = res.split("\n")
            contents_list = [
                x for x in contents_list if x != "." and x != ".." and x != ""
            ]
            for element in contents_list:
                element_src = src / element
                element_dest = dest / element
                if element_src == element_dest:
                    continue
                self.pull(element_src, element_dest)
    
        else:
            file_string = "IS_FILE"
            res = self.shell(f"[ -f \"{src}\" ] && echo {file_string}")
            if file_string not in res:
                raise FileNotFoundError(f"Cannot find {src} on device")
            self._pull(str(src), str(dest))
            try:
                mtime_str = self.shell(f"stat --format='%.Y' \"{src}\"")
                mtime_float = float(mtime_str)
                os.utime(dest, (mtime_float, mtime_float))
            except:
                print(f"Setting mtime failed {dest}")

Unlike the ls, the find does not return . and .. but the directory itself. Could probably get rid of the list comprehension except for the empty string. Had to check for src and dest being the same for the first iteration to allow it to proceed. There's probably a cleaner way of doing this, but I'm not a programmer.

[ACButcher]

Thanks for pointing this out and finding a fix-- looks like I introduced this bug when I implemented directory pulling. If you'd like to open a PR for this, go ahead, otherwise I'll make the changes myself this weekend.

[cobaltdr]

Thanks for pointing this out and finding a fix-- looks like I introduced this bug when I implemented directory pulling. If you'd like to open a PR for this, go ahead, otherwise I'll make the changes myself this weekend.

I tried a pull request, for some reason, it did not seem to work. The other bug I filed as well for the timestamp also has a fix for it in the ticket - those changes are towards the end of the function in the above post, but have to 'import os'.