Merge lp:~artem-anufrij/audience/fixed-freeze into lp:~audience-members/audience/trunk

Proposed by Artem Anufrij
Status: Merged
Approved by: Danielle Foré
Approved revision: 671
Merged at revision: 669
Proposed branch: lp:~artem-anufrij/audience/fixed-freeze
Merge into: lp:~audience-members/audience/trunk
Diff against target: 62 lines (+11/-24)
2 files modified
src/Services/LibraryManager.vala (+10/-23)
src/Window.vala (+1/-1)
To merge this branch: bzr merge lp:~artem-anufrij/audience/fixed-freeze
Reviewer Review Type Date Requested Status
Audience Members Pending
Review via email: mp+306705@code.launchpad.net

Commit message

- Improved auto clear function
- Fixed regression with VideoPlayer not requesting it's size

To post a comment you must log in.
Revision history for this message
RabbitBot (rabbitbot-a) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Services/LibraryManager.vala'
2--- src/Services/LibraryManager.vala 2016-09-25 00:38:53 +0000
3+++ src/Services/LibraryManager.vala 2016-09-25 19:00:50 +0000
4@@ -140,35 +140,22 @@
5 }
6
7 public async void clear_unused_cache_files () {
8- string[] hash_items = poster_hash.to_array ();
9- ThreadFunc<void*> run = () => {
10+ File directory = File.new_for_path (App.get_instance ().get_cache_directory ());
11+ directory.enumerate_children_async.begin (FileAttribute.STANDARD_NAME, 0, Priority.DEFAULT, null, (obj, res) => {
12+ try {
13+ FileEnumerator children = directory.enumerate_children_async.end (res);
14+ FileInfo file_info;
15
16- File directory = File.new_for_path (App.get_instance ().get_cache_directory ());
17- try {
18- var children = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0);
19- if (children != null) {
20- FileInfo file_info;
21- while ((file_info = children.next_file ()) != null) {
22- foreach (unowned string hash_item in hash_items) {
23- if (hash_item == file_info.get_name ()) {
24- continue;
25- }
26- children.get_child (file_info).delete_async.begin ();
27- }
28+ while ((file_info = children.next_file ()) != null) {
29+ if (!poster_hash.contains (file_info.get_name ())) {
30+ File to_delete = children.get_child (file_info);
31+ to_delete.delete_async.begin ();
32 }
33 }
34 } catch (Error e) {
35 warning (e.message);
36 }
37-
38- return null;
39- };
40-
41- try {
42- new Thread<void*>.try (null, run);
43- } catch (Error e) {
44- error (e.message);
45- }
46+ });
47 }
48
49 private void deleted_items (Audience.Objects.Video video) {
50
51=== modified file 'src/Window.vala'
52--- src/Window.vala 2016-09-25 00:38:53 +0000
53+++ src/Window.vala 2016-09-25 19:00:50 +0000
54@@ -153,7 +153,7 @@
55 app_notification.add (notification_frame);
56
57 var overlay = new Gtk.Overlay ();
58- overlay.add_overlay (main_stack);
59+ overlay.add (main_stack);
60 overlay.add_overlay (app_notification);
61
62 add (overlay);

Subscribers

People subscribed via source and target branches