additional subPath column in thumb db;

Carl Chang · Carl Chang · commit fbe101cf1aca · 2020-03-03T02:15:10.000+08:00
improve thumb load speed over large number of containers;
diff --git a/BlockWindow.xaml b/BlockWindow.xaml
@@ -24,24 +24,27 @@
             <Binding RelativeSource="{RelativeSource Self}" Path="Height"/>
         </MultiBinding>
     </Window.Top>-->
-    <Grid x:Name="grid" RenderTransformOrigin="0.5,0.5">
-        <TextBlock x:Name="T_Title" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,15,0,0" FontWeight="Bold"
+    <Grid x:Name="grid" RenderTransformOrigin="0.5,0.5" Margin="0 0 0 20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock x:Name="T_Title" HorizontalAlignment="Center" VerticalAlignment="Top" FontWeight="Bold"
                    Text="{Binding MessageTitle, ElementName=BlockWin, Mode=OneWay}"/>
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-            <TextBlock x:Name="TB_Message" HorizontalAlignment="Center" TextWrapping="Wrap" FontSize="10"
-                       Text="{Binding MessageBody, ElementName=BlockWin, Mode=OneWay}"/>
-            <ProgressBar x:Name="PB_Message" Height="{Binding FontSize, ElementName=BlockWin, Mode=OneWay}" Width="200" Margin="0,10,0,0"
+        <TextBlock Grid.Row="1" x:Name="TB_Message" HorizontalAlignment="Center" TextWrapping="Wrap" FontSize="10" Margin="0 10"
+                   Text="{Binding MessageBody, ElementName=BlockWin, Mode=OneWay}"/>
+        <ProgressBar Grid.Row="2" x:Name="PB_Message" Height="{Binding FontSize, ElementName=BlockWin, Mode=OneWay}" Width="200"
                          Value="{Binding Percentage, ElementName=BlockWin, Mode=OneWay}">
-                <ProgressBar.Style>
-                    <Style TargetType="ProgressBar">
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding Percentage, ElementName=BlockWin, Mode=OneWay}" Value="-1">
-                                <Setter Property="IsIndeterminate" Value="True" />
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </ProgressBar.Style>
-            </ProgressBar>
-        </StackPanel>
+            <ProgressBar.Style>
+                <Style TargetType="ProgressBar">
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Percentage, ElementName=BlockWin, Mode=OneWay}" Value="-1">
+                            <Setter Property="IsIndeterminate" Value="True" />
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </ProgressBar.Style>
+        </ProgressBar>
     </Grid>
 </local:RoundedWindow>
diff --git a/Helpers/LoadHelper.cs b/Helpers/LoadHelper.cs
@@ -179,10 +179,9 @@ private static bool extractZip(LoadOptions options, ObjectInfo objInfo, HashSet<
 
                     ImageSource source = null;
                     if (options.LoadImage) {
-                        var thumbPathInDb = Path.Combine(options.FilePath, fileName);
                         if (options.TryCache && isThumb) {
                             //try load from cache
-                            source = SQLiteHelper.GetFromThumbDB(thumbPathInDb, options.DecodeSize);
+                            source = SQLiteHelper.GetFromThumbDB(options.FilePath, options.DecodeSize, fileName)?.Item1;
                         }
                         if (source == null) {
 #if DEBUG
@@ -196,7 +195,7 @@ private static bool extractZip(LoadOptions options, ObjectInfo objInfo, HashSet<
                                 success = true; //if the task is cancelled, success info is still returned correctly.
                                 source = GetImageSource(ms, options.DecodeSize);
                             }
-                            if (isThumb && source != null) SQLiteHelper.AddToThumbDB(source, thumbPathInDb, options.DecodeSize);
+                            if (isThumb && source != null) SQLiteHelper.AddToThumbDB(source, options.FilePath, fileName, options.DecodeSize);
                         }
                     }
 
@@ -446,11 +445,13 @@ public static async Task<BitmapSource> GetImageSourceAsync(string path, SizeInt
         /// </summary>
         public static BitmapSource GetImageSource(string path, SizeInt decodeSize = default, bool tryCache = true) {
             BitmapSource bs = null;
+            var basePath = Path.GetDirectoryName(path);
+            var subPath = Path.GetFileName(path);
             try {
                 var isThumb = decodeSize == (SizeInt)Setting.ThumbnailSize;
                 if (tryCache && isThumb) {
                     //try load from cache when decodeSize is non-zero
-                    bs = SQLiteHelper.GetFromThumbDB(path, decodeSize);
+                    bs = SQLiteHelper.GetFromThumbDB(basePath, decodeSize, subPath)?.Item1;
                     if (bs != null) return bs;
                 }
 #if DEBUG
@@ -460,7 +461,7 @@ public static BitmapSource GetImageSource(string path, SizeInt decodeSize = defa
                     bs = GetImageSource(fs, decodeSize);
                 }
                 if (isThumb && bs != null)
-                    SQLiteHelper.AddToThumbDB(bs, path, decodeSize);
+                    SQLiteHelper.AddToThumbDB(bs, basePath, subPath, decodeSize);
             }
             catch { }
             
@@ -634,8 +635,7 @@ public static void CacheFolder(string path, ref CancellationTokenSource tknSrc,
                     try {
                         objInfo.SourcePaths = GetSourcePaths(objInfo);
                         if (objInfo.SourcePaths?.Length > 0) {
-                            var p = Path.Combine(objInfo.ContainerPath, objInfo.SourcePaths[0]);
-                            if (!SQLiteHelper.ThumbExistInDB(p, decodeSize)) {
+                            if (!SQLiteHelper.ThumbExistInDB(objInfo.ContainerPath, objInfo.SourcePaths[0], decodeSize)) {
                                 GetImageSource(objInfo, 0, decodeSize, false);
                             }
                         }
diff --git a/Helpers/SQLiteHelper.cs b/Helpers/SQLiteHelper.cs
@@ -10,6 +10,7 @@
 using System.Windows.Media.Imaging;
 using SizeInt = System.Drawing.Size;
 using static ZipImageViewer.TableHelper;
+using System.Threading.Tasks;
 
 namespace ZipImageViewer
 {
@@ -60,10 +61,13 @@ internal static void CheckThumbsDB() {
                     using (var r = cmd.ExecuteReader()) {
                         while (r.Read()) {
                             switch (r["name"]) {
-                                case nameof(Column.VirtualPath):
+                                case nameof(Column.BasePath):
                                     if (r["type"].ToString() == "TEXT" &&
-                                        r["notnull"].ToString() == "1" &&
-                                        r["pk"].ToString() == "1") goodColumns += 1;
+                                        r["notnull"].ToString() == "1") goodColumns += 1;
+                                    break;
+                                case nameof(Column.SubPath):
+                                    if (r["type"].ToString() == "TEXT" &&
+                                        r["notnull"].ToString() == "1") goodColumns += 1;
                                     break;
                                 case nameof(Column.DecodeWidth):
                                 case nameof(Column.DecodeHeight):
@@ -78,7 +82,7 @@ internal static void CheckThumbsDB() {
                     }
                 }
             });
-            if (goodColumns == 4) return;
+            if (goodColumns == 5) return;
 
             //recreate thumbs table
             if (File.Exists(Tables[Table.Thumbs].FullPath))
@@ -90,17 +94,17 @@ internal static void CheckThumbsDB() {
                 using (var cmd = new SQLiteCommand(con)) {
                     cmd.CommandText =
 $@"create table if not exists [{table.Name}] (
-[{Column.VirtualPath}] TEXT NOT NULL,
+[{Column.BasePath}] TEXT NOT NULL,
+[{Column.SubPath}] TEXT NOT NULL,
 [{Column.DecodeWidth}] INTEGER,
 [{Column.DecodeHeight}] INTEGER,
-[{Column.ThumbData}] BLOB,
-PRIMARY KEY({Column.VirtualPath}))";
+[{Column.ThumbData}] BLOB)";
                     return cmd.ExecuteNonQuery();
                 }
             });
         }
 
-        internal static int AddToThumbDB(ImageSource source, string path, SizeInt decodeSize) {
+        internal static int AddToThumbDB(ImageSource source, string basePath, string subPath, SizeInt decodeSize) {
             if (!(source is BitmapSource bs)) throw new NotSupportedException();
 
             object[] affected = null;
@@ -116,13 +120,18 @@ internal static int AddToThumbDB(ImageSource source, string path, SizeInt decode
             affected = Execute(Table.Thumbs, (table, con) => {
                 using (var cmd = new SQLiteCommand(con)) {
                     //remove existing
-                    cmd.CommandText = $@"delete from {table.Name} where {Column.VirtualPath} = @path";
-                    cmd.Parameters.Add(new SQLiteParameter("@path", DbType.String) { Value = path });
+                    cmd.CommandText = 
+$@"delete from {table.Name} where
+{Column.BasePath} = @basePath and
+{Column.SubPath} = @subPath";
+                    cmd.Parameters.Add(new SQLiteParameter("@basePath", DbType.String) { Value = basePath });
+                    cmd.Parameters.Add(new SQLiteParameter("@subPath", DbType.String) { Value = subPath });
                     cmd.ExecuteNonQuery();
                     //insert new
-                    cmd.CommandText = $@"insert into {table.Name}
-({Column.VirtualPath}, {Column.DecodeWidth}, {Column.DecodeHeight}, {Column.ThumbData}) values
-(@path, {decodeSize.Width}, {decodeSize.Height}, @png)";
+                    cmd.CommandText = 
+$@"insert into {table.Name}
+({Column.BasePath}, {Column.SubPath}, {Column.DecodeWidth}, {Column.DecodeHeight}, {Column.ThumbData}) values
+(@basePath, @subPath, {decodeSize.Width}, {decodeSize.Height}, @png)";
                     cmd.Parameters.Add(new SQLiteParameter("@png", DbType.Binary) { Value = png });
                     return cmd.ExecuteNonQuery();
                 }
@@ -131,22 +140,35 @@ internal static int AddToThumbDB(ImageSource source, string path, SizeInt decode
             return (int)affected[0];
         }
 
+        /// <summary>
+        /// Async version of <see cref="GetFromThumbDB(string, string, SizeInt)"/>
+        /// </summary>
+        internal static Task<Tuple<BitmapSource, string>> GetFromThumbDBAsync(string basePath, SizeInt decodeSize, string subPath = null) {
+            return Task.Run(() => GetFromThumbDB(basePath, decodeSize, subPath));
+        }
+
         /// <summary>
         /// Returns null if thumb either does not exist in DB or has different size.
+        /// If <paramref name="subPath"/> is null, the first match by <paramref name="basePath"/> will be returned.
         /// </summary>
-        internal static BitmapSource GetFromThumbDB(string path, SizeInt decodeSize) {
+        internal static Tuple<BitmapSource, string> GetFromThumbDB(string basePath, SizeInt decodeSize, string subPath = null) {
             var png = Execute(Table.Thumbs, (table, con) => {
                 byte[] pngByte = null;
                 using (var cmd = new SQLiteCommand(con)) {
                     cmd.CommandText =
-$@"select {Column.ThumbData} from {table.Name} where
-{Column.VirtualPath} = @path and
+$@"select * from {table.Name} where
+{Column.BasePath} = @basePath
+{(subPath == null ? "" : $@"and {Column.SubPath} = @subPath")} and
 {Column.DecodeWidth} = {decodeSize.Width} and
-{Column.DecodeHeight} = {decodeSize.Height}";
-                    cmd.Parameters.Add(new SQLiteParameter("@path", DbType.String) { Value = path });
+{Column.DecodeHeight} = {decodeSize.Height} limit 1";
+                    cmd.Parameters.Add(new SQLiteParameter("@basePath", DbType.String) { Value = basePath });
+                    if (subPath != null)
+                        cmd.Parameters.Add(new SQLiteParameter("@subPath", DbType.String) { Value = subPath });
                     using (var reader = cmd.ExecuteReader()) {
                         while (reader.Read()) {
-                            pngByte = (byte[])reader[0];
+                            pngByte = (byte[])reader[nameof(Column.ThumbData)];
+                            if (subPath == null)
+                                subPath = (string)reader[nameof(Column.SubPath)];
                             break;
                         }
                     }
@@ -162,19 +184,22 @@ internal static BitmapSource GetFromThumbDB(string path, SizeInt decodeSize) {
                 bi.StreamSource = ms;
                 bi.EndInit();
                 bi.Freeze();
-                return bi;
+                return new Tuple<BitmapSource, string>(bi, subPath);
             }
         }
 
-        internal static bool ThumbExistInDB(string path, SizeInt decodeSize) {
+        internal static bool ThumbExistInDB(string basePath, string subPath, SizeInt decodeSize) {
             return (bool)Execute(Table.Thumbs, (table, con) => {
                 using (var cmd = new SQLiteCommand(con)) {
                     cmd.CommandText =
 $@"select count({Column.ThumbData}) from {table.Name} where
-{Column.VirtualPath} = @path and
+{Column.BasePath} = @basePath
+{(subPath == null ? "" : $@"and {Column.SubPath} = @subPath")} and
 {Column.DecodeWidth} = {decodeSize.Width} and
 {Column.DecodeHeight} = {decodeSize.Height}";
-                    cmd.Parameters.Add(new SQLiteParameter("@path", DbType.String) { Value = path });
+                    cmd.Parameters.Add(new SQLiteParameter("@basePath", DbType.String) { Value = basePath });
+                    if (subPath != null)
+                        cmd.Parameters.Add(new SQLiteParameter("@subPath", DbType.String) { Value = subPath });
                     using (var r = cmd.ExecuteReader()) {
                         r.Read();
                         return (long)r[0] > 0;
diff --git a/Helpers/SlideshowHelper.cs b/Helpers/SlideshowHelper.cs
@@ -236,10 +236,6 @@ private static void Anim_KBE(DpiImage tgtImg, Size frameSize, SlideAnimConfig cf
             //zoon animation
             var animZoom = zoomIn ? new DoubleAnimation(1d, 1.2d, imageDur) : new DoubleAnimation(1.2d, 1d, imageDur);
             
-            //transform center point
-            //tgtImg.RenderTransformOrigin = new Point(ran.NextDouble(), ran.NextDouble());
-            //tgtImg.RenderTransformOrigin = new Point(0.5, 0d);
-
             //pan animation
             DoubleAnimation animPanPri;
             DependencyProperty transEdgePri;
diff --git a/Helpers/TableHelper.cs b/Helpers/TableHelper.cs
@@ -15,8 +15,8 @@ public enum Table
 
         public enum Column
         {
-            VirtualPath, DecodeWidth, DecodeHeight, ThumbData,
-            Path, Password,
+            BasePath, SubPath, DecodeWidth, DecodeHeight, ThumbData,//Thumbs table
+            Path, Password,//MappedPasswords table
         }
 
         public class TableInfo
diff --git a/UserControls/Thumbnail.xaml.cs b/UserControls/Thumbnail.xaml.cs
@@ -26,7 +26,8 @@ public ObjectInfo ObjectInfo {
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        private int thumbIndex = -1;
+        private int sourcePathIdx;
+        private string sourcePathName;
 
         private int thumbTransAnimCount;
         private string thumbTransAnimName;
@@ -116,17 +117,17 @@ private void TN_Loaded(object sender, RoutedEventArgs e) {
 
             mainWin = (MainWindow)Window.GetWindow(this);
 
-            thumbIndex = -1;
+            sourcePathIdx = -2;
             cycleImageSource(null, null);
         }
 
         private void TN_Unloaded(object sender, RoutedEventArgs e) {
-            //ThumbImageSource = null;
+            ThumbImageSource = null;
             //if (ObjectInfo != null) {
             //    ObjectInfo.ImageSources = null;
             //    ObjectInfo = null;
             //}
-            //nextSource = null;
+            nextSource = null;
             //if (IM1 != null) {
             //    IM1.Source = null;
             //    IM1.ToolTip = null;
@@ -149,6 +150,21 @@ private async void cycleImageSource(object sender, EventArgs e) {
                 return;
             }
 
+            var thumbSize = (SizeInt)Setting.ThumbnailSize;
+            //load from db if exists (only the first time)
+            if ((tn.ObjectInfo.Flags == FileFlags.Directory || tn.ObjectInfo.Flags == FileFlags.Archive) && tn.sourcePathIdx == -2) {
+                tn.sourcePathIdx = -1;
+                var cached = await SQLiteHelper.GetFromThumbDBAsync(tn.ObjectInfo.ContainerPath, thumbSize);
+                if (cached != null) {
+                    tn.ThumbImageSource = cached.Item1;
+                    tn.sourcePathName = cached.Item2;
+                    tn.cycleTimer.Interval = TimeSpan.FromMilliseconds(mainWin.ThumbChangeDelay);
+                    tn.cycleTimer.Start();
+                    return;
+                }
+            }
+            if (tn.sourcePathIdx == -2) tn.sourcePathIdx = -1;
+
             //wait to get image
             if (tn.ObjectInfo.ImageSource == null && !Setting.ImmersionMode &&
                 (mainWin.tknSrc_LoadThumb != null || Interlocked.CompareExchange(ref workingThreads, 0, 0) >= MaxLoadThreads)) {
@@ -170,14 +186,15 @@ private async void cycleImageSource(object sender, EventArgs e) {
                     objInfo.SourcePaths = await GetSourcePathsAsync(objInfo);
                 }
                 //get the next path index to use
-                var thumbSize = (SizeInt)Setting.ThumbnailSize;
                 if (tn.ObjectInfo.SourcePaths?.Length > 1) {
-                    tn.thumbIndex = tn.thumbIndex == tn.ObjectInfo.SourcePaths.Length - 1 ? 0 : tn.thumbIndex + 1;
+                    do {
+                        tn.sourcePathIdx = tn.sourcePathIdx == tn.ObjectInfo.SourcePaths.Length - 1 ? 0 : tn.sourcePathIdx + 1;
+                    } while (tn.ObjectInfo.SourcePaths[tn.sourcePathIdx] == tn.sourcePathName);
                     cycle = true;
                 }
                 else
-                    tn.thumbIndex = 0;
-                tn.ThumbImageSource = await GetImageSourceAsync(tn.ObjectInfo, sourcePathIdx: tn.thumbIndex, decodeSize: thumbSize);
+                    tn.sourcePathIdx = 0;
+                tn.ThumbImageSource = await GetImageSourceAsync(tn.ObjectInfo, sourcePathIdx: tn.sourcePathIdx, decodeSize: thumbSize);
             }
             catch { }
             finally {
@@ -188,8 +205,7 @@ private async void cycleImageSource(object sender, EventArgs e) {
             if (!tn.IsLoaded || !mainWin.IsLoaded || !cycle) return;
 
             //plan for the next run
-            var delay = mainWin.ThumbChangeDelay;
-            tn.cycleTimer.Interval = TimeSpan.FromMilliseconds(delay);
+            tn.cycleTimer.Interval = TimeSpan.FromMilliseconds(mainWin.ThumbChangeDelay);
             tn.cycleTimer.Start();
         }
     }
diff --git a/packages.config b/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.2" targetFramework="net461" />
   <package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
-  <package id="SevenZipSharp.Net45" version="1.0.19" targetFramework="net461" />
+  <package id="SevenZipSharp.Net45" version="1.0.19" targetFramework="net472" />
   <package id="System.Data.SQLite.Core" version="1.0.112.0" targetFramework="net472" />
   <package id="System.Data.SQLite.Linq" version="1.0.112.0" targetFramework="net472" />
   <package id="VirtualizingWrapPanel" version="1.4.2" targetFramework="net472" />

Original file line number	Diff line number	Diff line change
`@@ -179,10 +179,9 @@ private static bool extractZip(LoadOptions options, ObjectInfo objInfo, HashSet<`
`179`	`179`
`180`	`180`	`ImageSource source = null;`
`181`	`181`	`if (options.LoadImage) {`
`182`		`- var thumbPathInDb = Path.Combine(options.FilePath, fileName);`
`183`	`182`	`if (options.TryCache && isThumb) {`
`184`	`183`	`//try load from cache`
`185`		`- source = SQLiteHelper.GetFromThumbDB(thumbPathInDb, options.DecodeSize);`
	`184`	`+ source = SQLiteHelper.GetFromThumbDB(options.FilePath, options.DecodeSize, fileName)?.Item1;`
`186`	`185`	`}`
`187`	`186`	`if (source == null) {`
`188`	`187`	`#if DEBUG`
`@@ -196,7 +195,7 @@ private static bool extractZip(LoadOptions options, ObjectInfo objInfo, HashSet<`
`196`	`195`	`success = true; //if the task is cancelled, success info is still returned correctly.`
`197`	`196`	`source = GetImageSource(ms, options.DecodeSize);`
`198`	`197`	`}`
`199`		`- if (isThumb && source != null) SQLiteHelper.AddToThumbDB(source, thumbPathInDb, options.DecodeSize);`
	`198`	`+ if (isThumb && source != null) SQLiteHelper.AddToThumbDB(source, options.FilePath, fileName, options.DecodeSize);`
`200`	`199`	`}`
`201`	`200`	`}`
`202`	`201`
`@@ -446,11 +445,13 @@ public static async Task<BitmapSource> GetImageSourceAsync(string path, SizeInt`
`446`	`445`	`/// </summary>`
`447`	`446`	`public static BitmapSource GetImageSource(string path, SizeInt decodeSize = default, bool tryCache = true) {`
`448`	`447`	`BitmapSource bs = null;`
	`448`	`+ var basePath = Path.GetDirectoryName(path);`
	`449`	`+ var subPath = Path.GetFileName(path);`
`449`	`450`	`try {`
`450`	`451`	`var isThumb = decodeSize == (SizeInt)Setting.ThumbnailSize;`
`451`	`452`	`if (tryCache && isThumb) {`
`452`	`453`	`//try load from cache when decodeSize is non-zero`
`453`		`- bs = SQLiteHelper.GetFromThumbDB(path, decodeSize);`
	`454`	`+ bs = SQLiteHelper.GetFromThumbDB(basePath, decodeSize, subPath)?.Item1;`
`454`	`455`	`if (bs != null) return bs;`
`455`	`456`	`}`
`456`	`457`	`#if DEBUG`
`@@ -460,7 +461,7 @@ public static BitmapSource GetImageSource(string path, SizeInt decodeSize = defa`
`460`	`461`	`bs = GetImageSource(fs, decodeSize);`
`461`	`462`	`}`
`462`	`463`	`if (isThumb && bs != null)`
`463`		`- SQLiteHelper.AddToThumbDB(bs, path, decodeSize);`
	`464`	`+ SQLiteHelper.AddToThumbDB(bs, basePath, subPath, decodeSize);`
`464`	`465`	`}`
`465`	`466`	`catch { }`
`466`	`467`
`@@ -634,8 +635,7 @@ public static void CacheFolder(string path, ref CancellationTokenSource tknSrc,`
`634`	`635`	`try {`
`635`	`636`	`objInfo.SourcePaths = GetSourcePaths(objInfo);`
`636`	`637`	`if (objInfo.SourcePaths?.Length > 0) {`
`637`		`- var p = Path.Combine(objInfo.ContainerPath, objInfo.SourcePaths[0]);`
`638`		`- if (!SQLiteHelper.ThumbExistInDB(p, decodeSize)) {`
	`638`	`+ if (!SQLiteHelper.ThumbExistInDB(objInfo.ContainerPath, objInfo.SourcePaths[0], decodeSize)) {`
`639`	`639`	`GetImageSource(objInfo, 0, decodeSize, false);`
`640`	`640`	`}`
`641`	`641`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public enum Table`
`15`	`15`
`16`	`16`	`public enum Column`
`17`	`17`	`{`
`18`		`- VirtualPath, DecodeWidth, DecodeHeight, ThumbData,`
`19`		`- Path, Password,`
	`18`	`+ BasePath, SubPath, DecodeWidth, DecodeHeight, ThumbData,//Thumbs table`
	`19`	`+ Path, Password,//MappedPasswords table`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public class TableInfo`