Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1236 from MediaBrowser/master

Browse Source 
add more migration error handling
This commit is contained in:
Luke 2015-10-28 16:26:41 -04:00
commit a9e0797878
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -224,6 +224,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
} }
private void MigrateMediaStreams(string file) private void MigrateMediaStreams(string file)
{
try
{ {
var backupFile = file + ".bak"; var backupFile = file + ".bak";
File.Copy(file, backupFile, true); File.Copy(file, backupFile, true);
@ -235,18 +237,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
"REPLACE INTO mediastreams("+columns+") SELECT "+columns+" FROM MediaInfoOld.mediastreams;" "REPLACE INTO mediastreams("+columns+") SELECT "+columns+" FROM MediaInfoOld.mediastreams;"
}; };
try
{
_connection.RunQueries(queries, _logger); _connection.RunQueries(queries, _logger);
File.Delete(file);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.ErrorException("Error migrating media info database", ex); _logger.ErrorException("Error migrating media info database", ex);
} }
finally
{
TryDeleteFile(file);
}
} }
private void MigrateChapters(string file) private void MigrateChapters(string file)
{
try
{ {
var backupFile = file + ".bak"; var backupFile = file + ".bak";
File.Copy(file, backupFile, true); File.Copy(file, backupFile, true);
@ -256,15 +261,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
"REPLACE INTO "+ChaptersTableName+"(ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) SELECT ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath FROM ChaptersOld.Chapters;" "REPLACE INTO "+ChaptersTableName+"(ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) SELECT ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath FROM ChaptersOld.Chapters;"
}; };
try
{
_connection.RunQueries(queries, _logger); _connection.RunQueries(queries, _logger);
File.Delete(file);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.ErrorException("Error migrating chapter database", ex); _logger.ErrorException("Error migrating chapter database", ex);
} }
finally
{
TryDeleteFile(file);
}
}
private void TryDeleteFile(string file)
{
try
{
File.Delete(file);
}
catch (Exception ex)
{
_logger.ErrorException("Error deleting file {0}", ex, file);
}
} }
/// <summary> /// <summary>