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.

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

Improved wl-paste mimetype handling in ImageGrab #7094

Merged
merged 13 commits into from
May 24, 2023

Conversation

rrcgat
Copy link
Contributor

@rrcgat rrcgat commented Apr 15, 2023

Fixes #7093

Changes proposed in this pull request:

  • Add -t <mime/type> arguments to wl-paste when there is an available image MIME type.

@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 15, 2023

The CI skip my test, which covered on my local machine. I'm not familiar with GitHub CI, anyone helps?

image

@nulano
Copy link
Contributor

nulano commented Apr 15, 2023

@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 16, 2023

@nulano Thanks for your reply, I'll try to modify the GitHub workflow to make it work.

im = ImageGrab.grabclipboard()
assert_image_equal_tofile(im, image_path)
except OSError as e:
pytest.skip(str(e))
Copy link
Member

Choose a reason for hiding this comment

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

What is the OSError that might be thrown here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, OSError will not be thrown here anymore. I made a mistake with skipif condition and OSError reported in other systems.

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved
rrcgat and others added 2 commits April 16, 2023 15:37
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 16, 2023

Hi everybody, I've tried a lot in test-workflow branch, but I couldn't find a solution to support wl-clipboard in xvfb.

The errors include:

  1. Failed to connect to a Wayland server (wl-clipboard)
  2. Core dumped without xwayland (in other test files)
  3. Missing a seat (wl-clipboard, I've tested seatd on Docker, not work)

Do you have any suggestions?

@radarhere
Copy link
Member

If you don't know of a simple way to add coverage for this, then I wouldn't think that is a blocker for this PR. You're not adding code that isn't covered into the middle of an otherwise-covered section - we weren't testing wl-paste or xclip on our CIs to begin with. See https://app.codecov.io/gh/python-pillow/Pillow/blob/main/src/PIL/ImageGrab.py

@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 17, 2023

Hi @radarhere , I finally found a way to test wl-paste by using sway. The CI is running, I'll commit to this branch if it works.

@radarhere
Copy link
Member

Unfortunately, there is a problem. If I remove the fix, the test doesn't fail.

@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 17, 2023

Hi @radarhere , If you remove the fix, the test won't fail because there's only one MIME type (set by subprocess.call(["wl-copy"], stdin=raw_image)), so wl-paste without arguments works fine.

image

It seems impossible to pick several MIME types with wl-copy, so I don't know how to test this scenario.

@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 17, 2023

I didn't set the CODECOV_TOKEN previously, but after setting it, I reran some workflows.

@radarhere
Copy link
Member

I've created rrcgat#1 with some suggestions for this PR.

Call init() if mimetype is not found with preinit()
@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 21, 2023

Thanks for getting back to me! Apologies for the inconvenience, I wasn't aware of these suggestions until you left a comment.

@radarhere
Copy link
Member

radarhere commented Apr 21, 2023

I've discovered a problem. I ran Ubuntu, switched to Wayland, opened https://python-pillow.org/images/pillow-logo-light-text-1280x640.png in Firefox, copied the image, and ran wl-paste -l.
The first option in wl-paste -l was TIFF, and when I selected that as the mime type, it saved an empty file!
Only when I chose PNG instead did the image save.

png.mp4

If the first suggestion from wl-paste -l doesn't necessarily work, I guess that means this PR needs to iterate through the mime types until it finds one that works? That seems cumbersome.

I later tried copying a GIF from FIrefox. wl-paste -l gave the same list of mime types.

gif.mov

@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 21, 2023

@radarhere Yes, you're right, I didn't test it to much because I simply thought image/png and image/gif is enough for the image type of wl-paste.

In the early days before, I found that image/png can be use for ICO and JPEG in the case of wl-paste. Without much knowledge of image type, I thought that image/png can be use for other image type, so I only check for PNG and GIF format in my first commit.

When I opened https://python-pillow.org/images/pillow-logo-light-text-1280x640.png, Firefox and Chrome offered different MIME types (Chrome only offered text/html and image/png), and I have different order of wl-paste -l compare to yours, which both copied from Firefox (with Gnome and Wayland). For the PNG and JPEG image, even GIF (for example, https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Rotating_earth_%28large%29.gif/200px-Rotating_earth_%28large%29.gif) Chrome offered the same MIME type (the output of wl-paste -l).

It seems that there are too many cases of copy, iterate through the mime types works (with different MIME types, wl-paste output with different file size, I don't know if it matters), but as you said, it's cumbersome.

@rrcgat
Copy link
Contributor Author

rrcgat commented Apr 21, 2023

Use the hard way here: https://github.com/rrcgat/Pillow/pull/2/files

What do you think?

def grabclipboard():
    ...
    else:
        if shutil.which("wl-paste"):
            args = ["wl-paste"]
            output = subprocess.check_output(["wl-paste", "-l"]).decode()
            clipboard_mimetypes = set(output.splitlines())

            Image.preinit()
            available_mimetypes = set(Image.MIME.values()) & clipboard_mimetypes
            if not available_mimetypes:
                Image.init()
                available_mimetypes = set(Image.MIME.values()) & clipboard_mimetypes
            if available_mimetypes:
                return _grab(
                    *[["wl-paste", "-t", mimetype] for mimetype in available_mimetypes]
                )
        elif shutil.which("xclip"):
            args = ["xclip", "-selection", "clipboard", "-t", "image/png", "-o"]
        else:
            msg = "wl-paste or xclip is required for ImageGrab.grabclipboard() on Linux"
            raise NotImplementedError(msg)
        return _grab(args)


def _grab(*call_args):
    fh, filepath = tempfile.mkstemp()
    for args in call_args:
        subprocess.call(args, stdout=fh)
        if os.path.getsize(fh):
            break
    os.close(fh)
    try:
        im = Image.open(filepath)
        im.load()
    finally:  # Remove it anyway or left it when Image.open fails (for debug usage)?
        os.unlink(filepath)
    return im

@radarhere
Copy link
Member

I think iterating through all of the different mime types doesn't sit nicely with #7110, a request that we raise an error on a failed ImageGrab operation - because if we try 12 different wl-paste variations, then we don't know which error to show.

Let me suggest this instead. Given the output of wl-paste -l,

  1. If there is only one mime type, use that.
  2. If there are multiple mime types, and one of them is "image/png", use that. This worked in my earlier recording for a GIF, when the first mime type was TIFF.
  3. Otherwise, use the first mime type listed.

What do you think?

@rrcgat
Copy link
Contributor Author

rrcgat commented May 23, 2023

@radarhere I agree, this approach is better than iterating through all mime types and it works well in my initial case. I will implement this solution based on your suggestion.

@rrcgat
Copy link
Contributor Author

rrcgat commented May 23, 2023

Using the first mime type when there are multiple mime types without image/png is great, although image/png mime type is provided in the video:

Screencast.from.2023-05-23.18-50-35.webm

@radarhere radarhere mentioned this pull request May 23, 2023
@radarhere
Copy link
Member

Thanks, looks good to me. I've created rrcgat#3 with minor formatting suggestions.

@hugovk hugovk merged commit d4b7cfa into python-pillow:main May 24, 2023
@radarhere radarhere changed the title Fix ImageGrab with wl-paste Improved wl-paste mimetype handling in ImageGrab May 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

wl-paste with image copied from browser results in ImageGrab.grabclipboard error
4 participants