Skip to content

Move get_screenshots () to Package #2287

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

Merged
ryonakano merged 5 commits into from
Aug 28, 2025
Merged

Move get_screenshots () to Package #2287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7cb4b4
Move get_screenshots () to Package
danirabbit Apr 16, 2025
456f04c
Remove extra newline
ryonakano Apr 19, 2025
f25452e
Address review comments
danirabbit Aug 28, 2025
848ee3c
merge main
danirabbit Aug 28, 2025
bd948d7
Merge branch 'main' into danirabbit/package-screenshots
danirabbit Aug 28, 2025
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
61 changes: 61 additions & 0 deletions src/Core/Package.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,67 @@ public class AppCenterCore.Package : Object {
return null;
}

public GenericArray<AppStream.Screenshot> get_screenshots () {
bool has_matching_environment = false;
bool has_matching_style = false;
var desktop_environment = Environment.get_variable ("XDG_SESSION_DESKTOP");
var prefer_dark_style = Gtk.Settings.get_default ().gtk_application_prefer_dark_theme;
var desktop_style = prefer_dark_style? AppStream.ColorSchemeKind.DARK.to_string () : AppStream.ColorSchemeKind.LIGHT.to_string ();

component.sort_screenshots (desktop_environment, desktop_style.to_string (), false);
var all_screenshots = component.get_screenshots_all ();

// This first pass is to gather if we have matching style and matching
// desktop environments, this is useful if we need to fall back to any
// screnshot if none of the conditions are fullfiled
foreach (unowned var screenshot in all_screenshots) {
var environment_id = screenshot.get_environment ();
if (environment_id != null) {
var environment_split = environment_id.split (":", 2);
var screenshot_environment = environment_split[0];
var screenshot_style = environment_split[1] ?? AppStream.ColorSchemeKind.LIGHT.to_string ();

if (screenshot_environment == desktop_environment) {
has_matching_environment = true;
}

if (screenshot_style == desktop_style) {
has_matching_style = true;
}
}
}

var screenshots = new GenericArray<AppStream.Screenshot> ();

foreach (unowned var screenshot in all_screenshots) {
var environment_id = screenshot.get_environment ();
if (environment_id == null) {
screenshots.add (screenshot);
continue;
}

var environment_split = environment_id.split (":", 2);
var screenshot_environment = environment_split[0];
var screenshot_style = environment_split[1] ?? AppStream.ColorSchemeKind.LIGHT.to_string ();

var same_environment = screenshot_environment == desktop_environment;
var same_style = screenshot_style == desktop_style;

if (same_environment && same_style) {
screenshots.add (screenshot);
} else if (same_environment && !same_style && !has_matching_style) {
screenshots.add (screenshot);
} else if (!same_environment && same_style && !has_matching_environment) {
screenshots.add (screenshot);
} else if (!has_matching_environment && !has_matching_style) {
screenshots.add (screenshot);
continue;
}
}

return screenshots;
}

public async uint64 get_download_size_including_deps () {
uint64 size = 0;
try {
Expand Down
65 changes: 1 addition & 64 deletions src/Views/AppInfoView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,70 +516,7 @@ public class AppCenter.Views.AppInfoView : Adw.NavigationPage {
));
}

bool has_matching_environment = false;
bool has_matching_style = false;
var desktop_environment = Environment.get_variable ("XDG_SESSION_DESKTOP");
var prefer_dark_style = Gtk.Settings.get_default ().gtk_application_prefer_dark_theme;
var desktop_style = prefer_dark_style
? AppStream.ColorSchemeKind.DARK.to_string ()
: AppStream.ColorSchemeKind.LIGHT.to_string ();

package_component.sort_screenshots (desktop_environment,
desktop_style.to_string (),
false);

var all_screenshots = package_component.get_screenshots_all ();

// This first pass is to gather if we have matching style and matching
// desktop environments, this is useful if we need to fall back to any
// screnshot if none of the conditions are fullfiled
all_screenshots.foreach ((screenshot) => {
var environment_id = screenshot.get_environment ();
if (environment_id != null) {
var environment_split = environment_id.split (":", 2);
var screenshot_environment = environment_split[0];
var screenshot_style = environment_split[1]
?? AppStream.ColorSchemeKind.LIGHT.to_string ();

if (screenshot_environment == desktop_environment) {
has_matching_environment = true;
}

if (screenshot_style == desktop_style) {
has_matching_style = true;
}
}
});

screenshots = new GenericArray<AppStream.Screenshot> ();

all_screenshots.foreach ((screenshot) => {
var environment_id = screenshot.get_environment ();
if (environment_id == null) {
screenshots.add (screenshot);
return;
}

var environment_split = environment_id.split (":", 2);
var screenshot_environment = environment_split[0];
var screenshot_style = environment_split[1]
?? AppStream.ColorSchemeKind.LIGHT.to_string ();

var same_environment = screenshot_environment == desktop_environment;
var same_style = screenshot_style == desktop_style;

if (same_environment && same_style) {
screenshots.add (screenshot);
} else if (same_environment && !same_style && !has_matching_style) {
screenshots.add (screenshot);
} else if (!same_environment && same_style && !has_matching_environment) {
screenshots.add (screenshot);
} else if (!has_matching_environment && !has_matching_style) {
screenshots.add (screenshot);
return;
}
});

screenshots = package.get_screenshots ();
if (screenshots.length > 0) {
screenshot_carousel = new Adw.Carousel () {
allow_mouse_drag = true,
Expand Down