Merge pull request #551 from pzgulyas/timetable-or

> @cjakeman, @twpol, could you please explain the reason of discrepancy between the two above linked descriptions?

Sharpe49 is quite correct.

The Open Rails Triage delivers a report of the active submissions for James to monitor. I don't think it takes any action.

The process for peer-reviewers is set out in Contributing.md

Hope that helps,

Chris

Author: cjakeman

Source/ContentChecker/TrackFileLoader.cs

@@ -131,7 +131,7 @@ void AddAllActivities()
                 List<string> timetableFiles = new List<string>();
                 timetableFiles.AddRange(Directory.GetFiles(activityPathOr, "*.timetable_or"));
                 timetableFiles.AddRange(Directory.GetFiles(activityPathOr, "*.timetable-or"));
-                timetableFiles.AddRange(Directory.GetFiles(activityPathOr, "*.timetablelist-or"));
+                timetableFiles.AddRange(Directory.GetFiles(activityPathOr, "*.timetablelist_or"));
                 timetableFiles.AddRange(Directory.GetFiles(activityPathOr, "*.timetablelist-or"));
                 foreach (string timetableFile in timetableFiles)
                 {

Source/Contrib/ContentManager/ContentMSTS.cs

@@ -124,7 +124,7 @@ public override IEnumerable<Content> Get(ContentType type)
 
                 var pathOR = Path.Combine(PathName, @"Activities\OpenRails");
                 if (Directory.Exists(pathOR))
-                    foreach (var item in Directory.GetFiles(pathOR, "*.timetable_or"))
+                    foreach (var item in Enumerable.Concat(Directory.GetFiles(pathOR, "*.timetable_or"), Directory.GetFiles(pathOR, "*.timetable-or")))
                         yield return new ContentORTimetableActivity(this, Path.Combine(pathOR, item));
             }
         }

Source/Contrib/ContentManager/Models/Activity.cs

@@ -50,7 +50,8 @@ public Activity(Content content)
                 else
                     Services = new string[0];
             }
-            else if (System.IO.Path.GetExtension(content.PathName).Equals(".timetable_or", StringComparison.OrdinalIgnoreCase))
+            else if (System.IO.Path.GetExtension(content.PathName).Equals(".timetable_or", StringComparison.OrdinalIgnoreCase)
+                || System.IO.Path.GetExtension(content.PathName).Equals(".timetable-or", StringComparison.OrdinalIgnoreCase))
             {
                 // TODO: Make common timetable parser.
                 var file = new TimetableReader(content.PathName);

Source/Contrib/ContentManager/Models/Service.cs

@@ -69,7 +69,8 @@ public Service(Content content)
                     Stops = trafficService.TrafficDetails.Zip(activityService.ServiceList, (tt, stop) => new Stop(stop.PlatformStartID, stop.DistanceDownPath, MSTSTimeToDateTime(tt.ArrivalTime), MSTSTimeToDateTime(tt.DepartTime)));
                 }
             }
-            else if (System.IO.Path.GetExtension(content.PathName).Equals(".timetable_or", StringComparison.OrdinalIgnoreCase))
+            else if (System.IO.Path.GetExtension(content.PathName).Equals(".timetable_or", StringComparison.OrdinalIgnoreCase)
+                || System.IO.Path.GetExtension(content.PathName).Equals(".timetable-or", StringComparison.OrdinalIgnoreCase))
             {
                 // TODO: Make common timetable parser.
                 var file = new TimetableReader(content.PathName);

Source/Menu/MainForm.cs

@@ -829,7 +829,7 @@ void ShowRouteList()
                 var extension = System.IO.Path.GetExtension(path).ToLower();
                 if (extension == ".act")
                     radioButtonModeActivity.Checked = true;
-                else if (extension == ".timetable_or")
+                else if (extension == ".timetable_or" || extension == ".timetable-or")
                     radioButtonModeTimetable.Checked = true;
             }
             UpdateEnabled();