diff options
| -rw-r--r-- | MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 730632bb3..167c96185 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -225,45 +225,63 @@ namespace MediaBrowser.Server.Implementations.Persistence private void MigrateMediaStreams(string file) { - var backupFile = file + ".bak"; - File.Copy(file, backupFile, true); - SqliteExtensions.Attach(_connection, backupFile, "MediaInfoOld"); + try + { + var backupFile = file + ".bak"; + File.Copy(file, backupFile, true); + SqliteExtensions.Attach(_connection, backupFile, "MediaInfoOld"); - var columns = string.Join(",", _mediaStreamSaveColumns); + var columns = string.Join(",", _mediaStreamSaveColumns); - string[] queries = { + string[] queries = { "REPLACE INTO mediastreams("+columns+") SELECT "+columns+" FROM MediaInfoOld.mediastreams;" }; - try - { _connection.RunQueries(queries, _logger); - File.Delete(file); } catch (Exception ex) { _logger.ErrorException("Error migrating media info database", ex); } + finally + { + TryDeleteFile(file); + } } private void MigrateChapters(string file) { - var backupFile = file + ".bak"; - File.Copy(file, backupFile, true); - SqliteExtensions.Attach(_connection, backupFile, "ChaptersOld"); + try + { + var backupFile = file + ".bak"; + File.Copy(file, backupFile, true); + SqliteExtensions.Attach(_connection, backupFile, "ChaptersOld"); - string[] queries = { + string[] queries = { "REPLACE INTO "+ChaptersTableName+"(ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) SELECT ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath FROM ChaptersOld.Chapters;" }; + _connection.RunQueries(queries, _logger); + } + catch (Exception ex) + { + _logger.ErrorException("Error migrating chapter database", ex); + } + finally + { + TryDeleteFile(file); + } + } + + private void TryDeleteFile(string file) + { try { - _connection.RunQueries(queries, _logger); File.Delete(file); } catch (Exception ex) { - _logger.ErrorException("Error migrating chapter database", ex); + _logger.ErrorException("Error deleting file {0}", ex, file); } } |