haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add method to add the filelist file

Browse Source 
this also fixes "control-files" being added to dlist
This commit is contained in:
BlueBlock
2019-09-10 13:09:25 -04:00
parent 6c05c19ca3
commit e0899a2a91
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Main/Volumes/FilesetVolumeWriter.cs
+21 -5
View File
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using Newtonsoft.Json;
using Duplicati.Library.Interface;
@@ -10,6 +8,7 @@ namespace Duplicati.Library.Main.Volumes
{
public class FilesetVolumeWriter : VolumeWriterBase
{
private MemoryStream m_memorystream;
private StreamWriter m_streamwriter;
private readonly JsonWriter m_writer;
private long m_filecount;
@@ -20,7 +19,8 @@ namespace Duplicati.Library.Main.Volumes
public FilesetVolumeWriter(Options options, DateTime timestamp)
: base(options, timestamp)
{
m_streamwriter = new StreamWriter(m_compression.CreateFile(FILELIST, CompressionHint.Compressible, DateTime.UtcNow));
m_memorystream = new MemoryStream();
m_streamwriter = new StreamWriter(m_memorystream, ENCODING);
m_writer = new JsonTextWriter(m_streamwriter);
m_writer.WriteStartArray();
}
@@ -84,7 +84,7 @@ namespace Duplicati.Library.Main.Volumes
if (blocklisthashes != null)
{
//Slightly akward, but we avoid writing if there are no entries
//Slightly awkward, but we avoid writing if there are no entries
using (var en = blocklisthashes.GetEnumerator())
{
if (en.MoveNext() && !string.IsNullOrEmpty(en.Current))
@@ -132,7 +132,6 @@ namespace Duplicati.Library.Main.Volumes
{
if (m_streamwriter != null)
{
m_writer.WriteEndArray();
m_writer.Close();
m_streamwriter.Dispose();
m_streamwriter = null;
@@ -141,6 +140,23 @@ namespace Duplicati.Library.Main.Volumes
base.Close();
}
public void AddFilelistFile()
{
if (m_streamwriter != null)
{
m_writer.WriteEndArray();
m_writer.Flush();
m_streamwriter.Flush();
}
using (Stream sr = m_compression.CreateFile(FILELIST, CompressionHint.Compressible, DateTime.UtcNow))
{
m_memorystream.Seek(0, SeekOrigin.Begin);
m_memorystream.CopyTo(sr);
sr.Flush();
}
}
public void AddControlFile(string localfile, CompressionHint hint, string filename = null)
{
filename = filename ?? System.IO.Path.GetFileName(localfile);