Adding Fixes and Handling Edge Cases

benjamin-stern · Jul 3, 2020 · 1ffda1e · 1ffda1e
1 parent faa4b89
commit 1ffda1e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Converter/MainWindow.xaml.cs b/Converter/MainWindow.xaml.cs
@@ -146,7 +146,7 @@ private void ConversionLogic() {
             for (int i = 0; i < totalLinks; i++)
             {
                 var link = _serviceMongo.GetLinkAt(i, _serviceSQLite);
-                _serviceSQLite.AddAsync(link);
+                if(link != null) _serviceSQLite.AddAsync(link);
 
                 //bool hasNew = false;
                 //if (link.LinkGroup.Id == 0) {

diff --git a/Converter/SefariaMongoDBService.cs b/Converter/SefariaMongoDBService.cs
@@ -216,6 +216,7 @@ public LinkItem GetLinkAt(int index, SefariaSQLiteConversionContext targetContex
             BsonValue availableLangs = null;
             foreach (var element in value.Elements)
             {
+                //Need to fix for { "_id" : ObjectId("51de8ce8edbab4523cea399f")}
                 switch (element.Name)
                 {
                     case "availableLangs":
@@ -227,11 +228,23 @@ public LinkItem GetLinkAt(int index, SefariaSQLiteConversionContext targetContex
                     case "expandedRefs1":
                         SecondaryTopic = element.Value.AsBsonArray.Values.ToList()[0].AsString;
                         break;
+                    case "refs":
+                        var refs = element.Value.AsBsonArray.Values.ToList();
+                        if (refs != null && refs.Count >= 2) {
+                            PrimaryTopic = refs[0].AsString;
+                            SecondaryTopic = refs[1].AsString;
+                        }
+                        break;
                     default:
                         break;
 
                 }
             }
+
+            if (PrimaryTopic == null || SecondaryTopic == null) {
+                return null;
+            }
+
             var primaryTopicSeperator = PrimaryTopic.LastIndexOf(' ');
             string primaryTopicName = PrimaryTopic.Substring(0, primaryTopicSeperator);
             string primaryTopicLocation = PrimaryTopic.Substring(primaryTopicSeperator + 1);
@@ -265,7 +278,7 @@ public LinkItem GetLinkAt(int index, SefariaSQLiteConversionContext targetContex
                     targetContext.Add(targetContext.LinkGroups, link.LinkGroup);
                 }
 
-                if (availableLangs.IsBsonArray)
+                if (availableLangs != null && availableLangs.IsBsonArray)
                 {
                     if (link.LinkGroup.LinkedLanguages == null)
                     {