made a few minor performance tweaks to track-data loading systems

Author: DavisDevelopment

src/pman/async/tasks/EfficientTrackListDataLoader.hx

@@ -34,6 +34,9 @@ using pman.async.Asyncs;
 using pman.async.VoidAsyncs;
 using pman.bg.DictTools;
 
+/**
+  load data for a list of Tracks as quickly as possible
+ **/
 @:access( pman.media.Track )
 class EfficientTrackListDataLoader extends Task1 {
     /* Constructor Function */
@@ -55,7 +58,7 @@ class EfficientTrackListDataLoader extends Task1 {
       * execute [this] Task
       */
     override function execute(done : VoidCb):Void {
-        trace('Starting EfficientTrackListDataLoader');
+        //trace('Starting EfficientTrackListDataLoader');
         var uris:Array<String> = new Array();
         for (track in tracks) {
             uris.push( track.uri );
@@ -126,6 +129,7 @@ class EfficientTrackListDataLoader extends Task1 {
 
         var track: Track;
         var data: TrackData;
+
         for (row in rows) {
             track = treg[row.uri];
             data = new TrackData( track );
@@ -159,9 +163,6 @@ class EfficientTrackListDataLoader extends Task1 {
       * perform database-writes
       */
     private function perform_writes(done : VoidCb):Void {
-        //writes.start(function() {
-            //done();
-        //});
         writes.series( done );
     }
 
@@ -211,17 +212,19 @@ class EfficientTrackListDataLoader extends Task1 {
             }
         }
 
-        var cpb = exec.createBatch();
-        for (create in creates)
-            cpb.asyncTask(cast create);
+        //var cpb = exec.createBatch();
+        //for (create in creates)
+            //cpb.asyncTask(cast create);
 
-        for (push in pushes)
-            cpb.asyncTask(cast push);
+        //for (push in pushes)
+            //cpb.asyncTask(cast push);
 
-        cpb.start(function() {
-            done();
-        });
-        //[creates.series, pushes.series].series( done );
+        //cpb.start(function() {
+            //done();
+        //});
+
+        /* run all created tasks */
+        creates.concat(pushes).series( done );
     }
 
     /**
@@ -300,30 +303,28 @@ class EfficientTrackListDataLoader extends Task1 {
         track._loadingData = true;
         track.data = data;
 
-        animFrame(function() {
-            var steps = new Array();
-            steps.push(function(nxt:VoidCb) {
-                pull_raw(row, data, function(?error) {
-                    if (error != null) {
-                        nxt( error );
-                    }
-                    else {
-                        ensure_track_data_completeness(data, function(?error) {
-                            track._loadingData = false;
-                            if (error != null) {
-                                return nxt( error );
-                            }
-                            else {
-                                nxt();
-                                track._dataLoaded.call( data );
-                            }
-                        });
-                    }
-                });
+        var steps = new Array();
+        steps.push(function(nxt: VoidCb) {
+            pull_raw(row, data, function(?error) {
+                if (error != null) {
+                    nxt( error );
+                }
+                else {
+                    ensure_track_data_completeness(data, function(?error) {
+                        track._loadingData = false;
+                        if (error != null) {
+                            return nxt( error );
+                        }
+                        else {
+                            nxt();
+                            track._dataLoaded.call( data );
+                        }
+                    });
+                }
             });
-            steps.push(data.initialize.bind(db, _));
-            VoidAsyncs.series(steps, next);
         });
+        steps.push(data.initialize.bind(db, _));
+        steps.series( next );
     }
 
     /**
@@ -376,8 +377,10 @@ class EfficientTrackListDataLoader extends Task1 {
         if (data.source.match(Create(_))) {
             return Complete;
         }
-        var decl = TrackData.getMediaDataSourceDeclFromPropertyList( properties );
-        return decl;
+        else {
+            var decl = TrackData.getMediaDataSourceDeclFromPropertyList( properties );
+            return decl;
+        }
     }
 
     /**
@@ -401,7 +404,8 @@ class EfficientTrackListDataLoader extends Task1 {
     private function autofill_data(data:TrackData, done:VoidCb):Void {
         //TODO fix auto-filler so that skipping it isn't beneficial
         //FIXME skip this step entirely
-        return defer(done.void());
+        return done();
+
         var autoFiller = new TrackDataAutoFill(data.track, data);
         autoFiller.giveCache( cache );
         autoFiller.run(function(?error) {
@@ -418,9 +422,6 @@ class EfficientTrackListDataLoader extends Task1 {
       * queue up the saving of the given TrackData
       */
     private function schedule_data_write(data : TrackData):Void {
-        //writes.task(@async {
-            //data.save(next, db);
-        //});
         writes.push(data.save.bind(_, db));
     }
 

src/pman/async/tasks/LoadTrackData.hx

@@ -64,17 +64,24 @@ class LoadTrackData extends Task2<TrackData> {
       * execute [this] Task
       */
     override function execute(done : Cb<TrackData>):Void {
-        track._loadingData = true;
-        [tryto_load, fill_missing_info, init_data].series(function(?error:Dynamic) {
-            track._loadingData = false;
-            if (error != null) {
-                done(error, null);
-            }
-            else {
-                done(null, data);
-                track._dataLoaded.call( data );
-            }
-        });
+        if ( !track._loadingData ) {
+            track._loadingData = true;
+            [tryto_load, fill_missing_info, init_data].series(function(?error:Dynamic) {
+                track._loadingData = false;
+                if (error != null) {
+                    done(error, null);
+                }
+                else {
+                    done(null, data);
+                    track._dataLoaded.call( data );
+                }
+            });
+        }
+        else {
+            track._dataLoaded.once(function(dat) {
+                done(null, dat);
+            });
+        }
     }
 
     /**
@@ -149,7 +156,7 @@ class LoadTrackData extends Task2<TrackData> {
             }
             else {
                 data.meta = meta;
-                trace( data.meta );
+                //trace( data.meta );
                 push_data_to_db( done );
             }
         });
@@ -194,6 +201,7 @@ class LoadTrackData extends Task2<TrackData> {
         steps.push(function(next) {
             //FIXME skip over this step
             return next();
+            
             var filler = new TrackDataAutoFill(track, data);
             filler.giveCache( cache );
             filler.run( next );
@@ -233,16 +241,16 @@ class LoadTrackData extends Task2<TrackData> {
       * get the MediaDataSourceDecl for [properties]
       */
     private function src_decl(data: TrackData):MediaDataSourceDecl {
-        trace( data.source );
-        trace( properties );
+        //trace( data.source );
+        //trace( properties );
 
         // result is [Complete] if [Create(_)]
         if (data.source.match(Create(_))) {
             return Complete;
         }
 
         var decl:MediaDataSourceDecl = TrackData.getMediaDataSourceDeclFromPropertyList( properties );
-        trace( decl );
+        //trace( decl );
         return decl;
     }