Ver código fonte

Update after Invercargill refactor

Billy Barrow 1 ano atrás
pai
commit
294a1e5da5

+ 3 - 3
src/Editor.vala

@@ -258,7 +258,7 @@ namespace Publicate {
 
         public async void add_asset (string name, string mimetype, GLib.InputStream stream, Ppub.CompressionInfo compression) {
 
-            var to_save = window.publication.assets.select<Savable>(a => new SavableAsset(window.publication, a)).to_sequence();
+            var to_save = window.publication.assets.select<Savable>(a => new SavableAsset(window.publication, a)).to_series();
             to_save.add(new SavableNewAsset(name, mimetype, stream, compression));
             yield save(to_save);
             
@@ -290,7 +290,7 @@ namespace Publicate {
         }
 
         private bool app_close_request() {
-            if(Invercargill.gte(open_editors.values).any(e => e.has_unsaved_changes)) {
+            if(Invercargill.Convert.gte(open_editors.values).any(e => e.has_unsaved_changes)) {
                 var prompt = new Adw.MessageDialog(window, "Save Changes?", "There are editors with unsaved changes, would you like to save them before closing?");
                 prompt.add_response("cancel", "Cancel");
                 prompt.add_response("discard", "Discard");
@@ -343,7 +343,7 @@ namespace Publicate {
         private async void delete_file(Ppub.Asset asset) {
             var to_save = window.publication.assets
                 .where(a => a.name != asset.name)
-                .select<Savable>(a => new SavableAsset(window.publication, a)).to_sequence();
+                .select<Savable>(a => new SavableAsset(window.publication, a)).to_series();
 
             if(open_editors.has_key(asset.name)) {
                 Editors.EditorWidget editor;

+ 1 - 0
src/Editors/MetadataEditor.vala

@@ -2,6 +2,7 @@ using Gtk;
 using Adw;
 using GtkCommonMark;
 using Invercargill;
+using Invercargill.Convert;
 
 namespace Publicate.Editors {
 

+ 5 - 4
src/FileExplorer.vala

@@ -1,5 +1,6 @@
 using Adw;
 using Gtk;
+using Invercargill;
 
 namespace Publicate {
 
@@ -9,8 +10,8 @@ namespace Publicate {
         private ListBox file_list;
         private ScrolledWindow scroll_window;
 
-        private Invercargill.Sequence<Ppub.Asset> assets;
-        private Invercargill.Sequence<FileItem> file_items;
+        private Series<Ppub.Asset> assets;
+        private Series<FileItem> file_items;
 
         public signal void asset_selected(Ppub.Asset? asset);
 
@@ -39,8 +40,8 @@ namespace Publicate {
 
             create_list();
 
-            assets = files.to_sequence();
-            file_items = new Invercargill.Sequence<FileItem>();
+            assets = files.to_series();
+            file_items = new Invercargill.Series<FileItem>();
             
             foreach(var asset in assets) {
                 var item = new FileItem(asset);

+ 1 - 1
src/Licences/Licence.vala

@@ -11,7 +11,7 @@ namespace Publicate.Licences {
     }
 
     public static Invercargill.Enumerable<Licence> get_available_licences() {
-        return Invercargill.ate(new Licence[] {
+        return Invercargill.Convert.ate(new Licence[] {
             new CreativeCommonsBy(),
             new CreativeCommonsBySa(),
             new CreativeCommonsByNd(),

+ 2 - 2
src/Video/EncodingProfile.vala

@@ -35,7 +35,7 @@ namespace Publicate.Video {
         var xiph_360 = new TheoraVideo360pProfile() {alternative_to = vp9_360};
         var xiph_240 = new TheoraVideo240pProfile() {alternative_to = vp9_240};
 
-        return Invercargill.ate(new EncodingProfile[] {
+        return Invercargill.Convert.ate(new EncodingProfile[] {
             new Vp9Video1080pHighFramerateProfile (),
             new Vp9Video1080pLowFramerateProfile (),
             vp9_720,
@@ -58,7 +58,7 @@ namespace Publicate.Video {
         var avc_480 = new H264Video480pProfile() {alternative_to = vp9_480};
         var avc_240 = new H264Video240pProfile() {alternative_to = xiph_240};
 
-        return Invercargill.ate(new EncodingProfile[] {
+        return Invercargill.Convert.ate(new EncodingProfile[] {
             new Vp9Video1080pHighFramerateProfile (),
             new Vp9Video1080pLowFramerateProfile (),
             vp9_720,

+ 3 - 3
src/Video/VideoProcessor.vala

@@ -53,7 +53,7 @@ namespace Publicate.Video {
             var use_profiles = profiles.where(p => p.suitable_for(video_info));
 
             use_profiles.iterate(p => p.setup_for(video_info));
-            var encoders = use_profiles.select<Encoder>(p => new Encoder(video_file, "/tmp/", p)).to_sequence();
+            var encoders = use_profiles.select<Encoder>(p => new Encoder(video_file, "/tmp/", p)).to_series();
             foreach (var encoder in encoders) {
                 encoder.progress_changed.connect((frac, done) => {
                     var amount = frac;
@@ -71,12 +71,12 @@ namespace Publicate.Video {
             label.label = "Writing PPUB…";
 
             var manifest = new Ppub.VideoManifest();
-            manifest.streams = encoders.select<Ppub.VideoDescription>(e => e.get_video_description()).to_sequence();
+            manifest.streams = encoders.select<Ppub.VideoDescription>(e => e.get_video_description()).to_series();
             manifest.duration = video_info.duration;
             var ratio_parts = video_info.aspect_ratio.split(":");
             manifest.ratio = new double[] { double.parse(ratio_parts[0]), double.parse(ratio_parts[1]) };
 
-            return new VideoProcessResult(manifest, encoders.select<File>(e => e.get_output_file()).to_sequence());
+            return new VideoProcessResult(manifest, encoders.select<File>(e => e.get_output_file()).to_series());
         }
 
         private async void encode_video(Invercargill.Enumerable<Encoder> encoders) {