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.

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

Jump to bottom

feat(mv): Use "Clapper.MediaItem.cached" constructor #1044

Merged
merged 1 commit into from
Jun 28, 2024
Merged

feat(mv): Use "Clapper.MediaItem.cached" constructor #1044

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 10 additions & 19 deletions src/Views/MediaViewer.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,18 +413,13 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
}

#if CLAPPER_0_8
struct ClapperCacheItem {
public Clapper.MediaItem media_item;
public string location;
}

string clapper_cache_dir;
Gee.HashMap<string, ClapperCacheItem?> clapper_cached_items;
Gee.HashMap<string, string> clapper_cached_urls;
#endif
construct {
#if CLAPPER
#if CLAPPER_0_8
clapper_cached_items = new Gee.HashMap<string, ClapperCacheItem?> ();
clapper_cached_urls = new Gee.HashMap<string, string> ();
clapper_cache_dir = GLib.Path.build_path (GLib.Path.DIR_SEPARATOR_S, Tuba.cache_path, "clapper");
clapper_cache_cleanup (true);
#endif
Expand Down Expand Up @@ -563,7 +558,7 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
context_menu.unparent ();
#if CLAPPER_0_8
clapper_cache_cleanup (true);
clapper_cached_items.clear ();
clapper_cached_urls.clear ();
clapper_cached_locations.clear ();
#endif
}
Expand Down Expand Up @@ -1010,13 +1005,9 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
#if CLAPPER
Clapper.MediaItem clp_item;
#if CLAPPER_0_8
if (clapper_cached_items.has_key (url)) {
clp_item = clapper_cached_items.get (url).media_item;
} else {
#endif
clp_item = new Clapper.MediaItem (url);
#if CLAPPER_0_8
}
clp_item = new Clapper.MediaItem.cached (url, clapper_cached_urls.get (url));
#else
clp_item = new Clapper.MediaItem (url);
#endif

video.player.queue.add_item (clp_item);
Expand Down Expand Up @@ -1077,7 +1068,7 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
// (older items get cleaned up first).
Gee.ArrayList<string> clapper_cached_locations = new Gee.ArrayList<string> ();
private void on_clapper_download_complete (Clapper.MediaItem clp_media_item, string location) {
clapper_cached_items.set (clp_media_item.uri, {clp_media_item, location});
clapper_cached_urls.set (clp_media_item.uri, location);
clapper_cached_locations.add (location);
}

Expand All @@ -1088,9 +1079,9 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
var sliced = clapper_cached_locations.slice (0, to_remove);
clapper_cached_locations.remove_all (sliced);

clapper_cached_items.foreach (e => {
if (!clapper_cached_locations.contains (e.value.location))
clapper_cached_items.unset (e.key);
clapper_cached_urls.foreach (e => {
if (!clapper_cached_locations.contains (e.value))
clapper_cached_urls.unset (e.key);

return true;
});
Expand Down
Loading