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
=== modified file 'src/Services/LibraryManager.vala'
--- src/Services/LibraryManager.vala 2016-09-25 00:38:53 +0000
+++ src/Services/LibraryManager.vala 2016-09-25 19:00:50 +0000
@@ -140,35 +140,22 @@
140 }140 }
141141
142 public async void clear_unused_cache_files () {142 public async void clear_unused_cache_files () {
143 string[] hash_items = poster_hash.to_array ();143 File directory = File.new_for_path (App.get_instance ().get_cache_directory ());
144 ThreadFunc<void*> run = () => {144 directory.enumerate_children_async.begin (FileAttribute.STANDARD_NAME, 0, Priority.DEFAULT, null, (obj, res) => {
145 try {
146 FileEnumerator children = directory.enumerate_children_async.end (res);
147 FileInfo file_info;
145148
146 File directory = File.new_for_path (App.get_instance ().get_cache_directory ());149 while ((file_info = children.next_file ()) != null) {
147 try {150 if (!poster_hash.contains (file_info.get_name ())) {
148 var children = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0);151 File to_delete = children.get_child (file_info);
149 if (children != null) {152 to_delete.delete_async.begin ();
150 FileInfo file_info;
151 while ((file_info = children.next_file ()) != null) {
152 foreach (unowned string hash_item in hash_items) {
153 if (hash_item == file_info.get_name ()) {
154 continue;
155 }
156 children.get_child (file_info).delete_async.begin ();
157 }
158 }153 }
159 }154 }
160 } catch (Error e) {155 } catch (Error e) {
161 warning (e.message);156 warning (e.message);
162 }157 }
163158 });
164 return null;
165 };
166
167 try {
168 new Thread<void*>.try (null, run);
169 } catch (Error e) {
170 error (e.message);
171 }
172 }159 }
173160
174 private void deleted_items (Audience.Objects.Video video) {161 private void deleted_items (Audience.Objects.Video video) {
175162
=== modified file 'src/Window.vala'
--- src/Window.vala 2016-09-25 00:38:53 +0000
+++ src/Window.vala 2016-09-25 19:00:50 +0000
@@ -153,7 +153,7 @@
153 app_notification.add (notification_frame);153 app_notification.add (notification_frame);
154154
155 var overlay = new Gtk.Overlay ();155 var overlay = new Gtk.Overlay ();
156 overlay.add_overlay (main_stack);156 overlay.add (main_stack);
157 overlay.add_overlay (app_notification);157 overlay.add_overlay (app_notification);
158158
159 add (overlay);159 add (overlay);

Subscribers

People subscribed via source and target branches