Merge branch 'master' of https://github.com/AntonyCorbett/JWLMerge

AntonyCorbett · Mar 13, 2021 · a4faadd · a4faadd
2 parents 95a20d2 + 7a8d603
commit a4faadd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/JWLMerge.BackupFileServices/Models/DatabaseModels/Bookmark.cs b/JWLMerge.BackupFileServices/Models/DatabaseModels/Bookmark.cs
@@ -36,8 +36,8 @@ public class Bookmark
         public string Snippet { get; set; }
 
         /// <summary>
-        /// The block type.
-        /// 0 = Bible chapter?
+        /// The block type. Compare Locations.cs > BlockType
+        /// 0 = Publication 'page' (e.g. a song in the song book)
         /// 1 = Publication paragraph
         /// 2 = Bible verse
         /// </summary>

diff --git a/JWLMerge.BackupFileServices/Models/DatabaseModels/Location.cs b/JWLMerge.BackupFileServices/Models/DatabaseModels/Location.cs
@@ -36,7 +36,7 @@ public class Location
         public int IssueTagNumber { get; set; }
 
         /// <summary>
-        /// The JWL publication key symbol.
+        /// The JWL publication key symbol (nullable).
         /// </summary>
         public string KeySymbol { get; set; }
 
@@ -49,8 +49,8 @@ public class Location
         /// The type. 
         /// 0 = standard location entry
         /// 1 = reference to a publication (see Bookmark.PublicationLocationId)
-        /// 2 = ?
-        /// 3 = ?
+        /// 2 = music or song
+        /// 3 = video
         /// </summary>
         public int Type { get; set; }
 

diff --git a/JWLMerge.BackupFileServices/Models/DatabaseModels/UserMark.cs b/JWLMerge.BackupFileServices/Models/DatabaseModels/UserMark.cs
@@ -9,6 +9,7 @@ public class UserMark
 
         /// <summary>
         /// The index of the marking (highlight) color.
+        /// yellow = 1, green, blue, pink, orange, purple
         /// </summary>
         public int ColorIndex { get; set; }
 

diff --git a/Readme.md b/Readme.md
@@ -1,7 +1,5 @@
 # JWLMerge <img src="https://ci.appveyor.com/api/projects/status/2nl90i7apndaxcac?svg=true">
 
-*11 July 2020 - JWL was updated recently and JWLMerge is not yet compatible with the new backup file schema used*
-
 ### Introduction
 
 JWLMerge is a utility to merge 2 or more .jwlibrary backup files. These backup files are created using the JW Library® backup command, and contain your personal notes, highlighting, etc.
@@ -18,6 +16,16 @@ https://github.com/AntonyCorbett/JWLMerge/releases/latest
 
 Please see the wiki for further information.
 
+#### Wine
+
+If you are interested in running JWLMerge on Wine, please see this fork:
+
+https://github.com/SuperJC710e/JWLMerge
+
+And the notes here: 
+
+https://github.com/SuperJC710e/JWLMerge/wiki/Running-Under-Wine
+
 ### Important Notes
 
 Please use at your own risk! It is possible to crash JW Library by attempting to restore a corrupt backup file, and sometimes the only solution is to reinstall JW Library and reset its data. (This hasn't happened yet with a JWLMerge-generated file.)