Skip to content

Commit 6ee88f5

Browse files
wherewherewherewhere
committed
Change FileStatistics.Size to uint32 #133 
1 parent f0a145b commit 6ee88f5

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎AdvancedSharpAdbClient.Tests/SyncServiceTests.Async.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task StatAsyncTest()
3636
Assert.Equal("/fstab.donatello", value.Path);
3737
Assert.Equal(UnixFileStatus.Regular, value.FileMode.GetFileType());
3838
Assert.Equal((UnixFileStatus)416, value.FileMode.GetPermissions());
39-
Assert.Equal(597, value.Size);
39+
Assert.Equal(597u, value.Size);
4040
Assert.Equal(DateTimeExtensions.Epoch.ToLocalTime(), value.Time);
4141
Assert.Equal($"-rw-r-----\t597\t{value.Time}\t/fstab.donatello", value.ToString());
4242
}
@@ -76,28 +76,28 @@ public async Task GetListingAsyncTest()
7676
FileStatistics dir = value[0];
7777
Assert.Equal(".", dir.Path);
7878
Assert.Equal((UnixFileStatus)16873, dir.FileMode);
79-
Assert.Equal(0, dir.Size);
79+
Assert.Equal(0u, dir.Size);
8080
Assert.Equal(time, dir.Time);
8181
Assert.Equal($"drwxr-x--x\t0\t{dir.Time}\t.", dir.ToString());
8282

8383
FileStatistics parentDir = value[1];
8484
Assert.Equal("..", parentDir.Path);
8585
Assert.Equal((UnixFileStatus)16877, parentDir.FileMode);
86-
Assert.Equal(0, parentDir.Size);
86+
Assert.Equal(0u, parentDir.Size);
8787
Assert.Equal(time, parentDir.Time);
8888
Assert.Equal($"drwxr-xr-x\t0\t{dir.Time}\t..", parentDir.ToString());
8989

9090
FileStatistics sdcard0 = value[2];
9191
Assert.Equal("sdcard0", sdcard0.Path);
9292
Assert.Equal((UnixFileStatus)41471, sdcard0.FileMode);
93-
Assert.Equal(24, sdcard0.Size);
93+
Assert.Equal(24u, sdcard0.Size);
9494
Assert.Equal(time, sdcard0.Time);
9595
Assert.Equal($"lrwxrwxrwx\t24\t{dir.Time}\tsdcard0", sdcard0.ToString());
9696

9797
FileStatistics emulated = value[3];
9898
Assert.Equal("emulated", emulated.Path);
9999
Assert.Equal((UnixFileStatus)16749, emulated.FileMode);
100-
Assert.Equal(0, emulated.Size);
100+
Assert.Equal(0u, emulated.Size);
101101
Assert.Equal(time, emulated.Time);
102102
Assert.Equal($"dr-xr-xr-x\t0\t{dir.Time}\temulated", emulated.ToString());
103103
}
@@ -137,28 +137,28 @@ public async Task GetAsyncListingTest()
137137
FileStatistics dir = value[0];
138138
Assert.Equal(".", dir.Path);
139139
Assert.Equal((UnixFileStatus)16873, dir.FileMode);
140-
Assert.Equal(0, dir.Size);
140+
Assert.Equal(0u, dir.Size);
141141
Assert.Equal(time, dir.Time);
142142
Assert.Equal($"drwxr-x--x\t0\t{dir.Time}\t.", dir.ToString());
143143

144144
FileStatistics parentDir = value[1];
145145
Assert.Equal("..", parentDir.Path);
146146
Assert.Equal((UnixFileStatus)16877, parentDir.FileMode);
147-
Assert.Equal(0, parentDir.Size);
147+
Assert.Equal(0u, parentDir.Size);
148148
Assert.Equal(time, parentDir.Time);
149149
Assert.Equal($"drwxr-xr-x\t0\t{dir.Time}\t..", parentDir.ToString());
150150

151151
FileStatistics sdcard0 = value[2];
152152
Assert.Equal("sdcard0", sdcard0.Path);
153153
Assert.Equal((UnixFileStatus)41471, sdcard0.FileMode);
154-
Assert.Equal(24, sdcard0.Size);
154+
Assert.Equal(24u, sdcard0.Size);
155155
Assert.Equal(time, sdcard0.Time);
156156
Assert.Equal($"lrwxrwxrwx\t24\t{dir.Time}\tsdcard0", sdcard0.ToString());
157157

158158
FileStatistics emulated = value[3];
159159
Assert.Equal("emulated", emulated.Path);
160160
Assert.Equal((UnixFileStatus)16749, emulated.FileMode);
161-
Assert.Equal(0, emulated.Size);
161+
Assert.Equal(0u, emulated.Size);
162162
Assert.Equal(time, emulated.Time);
163163
Assert.Equal($"dr-xr-xr-x\t0\t{dir.Time}\temulated", emulated.ToString());
164164
}

‎AdvancedSharpAdbClient.Tests/SyncServiceTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void StatTest()
4444
Assert.Equal("/fstab.donatello", value.Path);
4545
Assert.Equal(UnixFileStatus.Regular, value.FileMode.GetFileType());
4646
Assert.Equal((UnixFileStatus)416, value.FileMode.GetPermissions());
47-
Assert.Equal(597, value.Size);
47+
Assert.Equal(597u, value.Size);
4848
Assert.Equal(DateTimeExtensions.Epoch.ToLocalTime(), value.Time);
4949
Assert.Equal($"-rw-r-----\t597\t{value.Time}\t/fstab.donatello", value.ToString());
5050
}
@@ -84,28 +84,28 @@ public void GetListingTest()
8484
FileStatistics dir = value[0];
8585
Assert.Equal(".", dir.Path);
8686
Assert.Equal((UnixFileStatus)16873, dir.FileMode);
87-
Assert.Equal(0, dir.Size);
87+
Assert.Equal(0u, dir.Size);
8888
Assert.Equal(time, dir.Time);
8989
Assert.Equal($"drwxr-x--x\t0\t{dir.Time}\t.", dir.ToString());
9090

9191
FileStatistics parentDir = value[1];
9292
Assert.Equal("..", parentDir.Path);
9393
Assert.Equal((UnixFileStatus)16877, parentDir.FileMode);
94-
Assert.Equal(0, parentDir.Size);
94+
Assert.Equal(0u, parentDir.Size);
9595
Assert.Equal(time, parentDir.Time);
9696
Assert.Equal($"drwxr-xr-x\t0\t{dir.Time}\t..", parentDir.ToString());
9797

9898
FileStatistics sdcard0 = value[2];
9999
Assert.Equal("sdcard0", sdcard0.Path);
100100
Assert.Equal((UnixFileStatus)41471, sdcard0.FileMode);
101-
Assert.Equal(24, sdcard0.Size);
101+
Assert.Equal(24u, sdcard0.Size);
102102
Assert.Equal(time, sdcard0.Time);
103103
Assert.Equal($"lrwxrwxrwx\t24\t{dir.Time}\tsdcard0", sdcard0.ToString());
104104

105105
FileStatistics emulated = value[3];
106106
Assert.Equal("emulated", emulated.Path);
107107
Assert.Equal((UnixFileStatus)16749, emulated.FileMode);
108-
Assert.Equal(0, emulated.Size);
108+
Assert.Equal(0u, emulated.Size);
109109
Assert.Equal(time, emulated.Time);
110110
Assert.Equal($"dr-xr-xr-x\t0\t{dir.Time}\temulated", emulated.ToString());
111111
}

‎AdvancedSharpAdbClient/Extensions/EnumerableBuilder.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ public static FileStatistics FileStatisticsCreator(ReadOnlySpan<byte> values)
5050
int index = 0;
5151
return new FileStatistics
5252
{
53-
FileMode = (UnixFileStatus)ReadInt32(values),
54-
Size = ReadInt32(values),
55-
Time = DateTimeOffset.FromUnixTimeSeconds(ReadInt32(values))
53+
FileMode = (UnixFileStatus)ReadUInt32(values),
54+
Size = ReadUInt32(values),
55+
Time = DateTimeOffset.FromUnixTimeSeconds(ReadUInt32(values))
5656
};
57-
int ReadInt32(in ReadOnlySpan<byte> data) => data[index++] | (data[index++] << 8) | (data[index++] << 16) | (data[index++] << 24);
57+
uint ReadUInt32(in ReadOnlySpan<byte> data) => unchecked((uint)(data[index++] | (data[index++] << 8) | (data[index++] << 16) | (data[index++] << 24)));
5858
}
5959

6060
/// <summary>

‎AdvancedSharpAdbClient/Models/FileStatistics.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public FileStatistics() { }
4141
/// <summary>
4242
/// Gets or sets the total file size, in bytes.
4343
/// </summary>
44-
public int Size { get; init; }
44+
public uint Size { get; init; }
4545

4646
/// <summary>
4747
/// Gets or sets the time of last modification.

‎AdvancedSharpAdbClient/SyncService.Async.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,11 +535,11 @@ protected async Task<FileStatistics> ReadStatisticsAsync(CancellationToken cance
535535
int index = 0;
536536
return new FileStatistics
537537
{
538-
FileMode = (UnixFileStatus)ReadInt32(statResult),
539-
Size = ReadInt32(statResult),
540-
Time = DateTimeOffset.FromUnixTimeSeconds(ReadInt32(statResult))
538+
FileMode = (UnixFileStatus)ReadUInt32(statResult),
539+
Size = ReadUInt32(statResult),
540+
Time = DateTimeOffset.FromUnixTimeSeconds(ReadUInt32(statResult))
541541
};
542-
int ReadInt32(byte[] data) => data[index++] | (data[index++] << 8) | (data[index++] << 16) | (data[index++] << 24);
542+
uint ReadUInt32(byte[] data) => unchecked((uint)(data[index++] | (data[index++] << 8) | (data[index++] << 16) | (data[index++] << 24)));
543543
#endif
544544
}
545545
}

‎AdvancedSharpAdbClient/SyncService.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public virtual void Pull(string remoteFilePath, Stream stream, Action<SyncProgre
254254

255255
// Gets file information, including the file size, used to calculate the total amount of bytes to receive.
256256
FileStatistics stat = Stat(remoteFilePath);
257-
int totalBytesToProcess = stat.Size;
257+
long totalBytesToProcess = stat.Size;
258258
long totalBytesRead = 0;
259259

260260
byte[] buffer = new byte[MaxBufferSize];
@@ -439,11 +439,11 @@ protected FileStatistics ReadStatistics()
439439
int index = 0;
440440
return new FileStatistics
441441
{
442-
FileMode = (UnixFileStatus)ReadInt32(statResult),
443-
Size = ReadInt32(statResult),
444-
Time = DateTimeOffset.FromUnixTimeSeconds(ReadInt32(statResult))
442+
FileMode = (UnixFileStatus)ReadUInt32(statResult),
443+
Size = ReadUInt32(statResult),
444+
Time = DateTimeOffset.FromUnixTimeSeconds(ReadUInt32(statResult))
445445
};
446-
int ReadInt32(byte[] data) => data[index++] | (data[index++] << 8) | (data[index++] << 16) | (data[index++] << 24);
446+
uint ReadUInt32(byte[] data) => unchecked((uint)(data[index++] | (data[index++] << 8) | (data[index++] << 16) | (data[index++] << 24)));
447447
#endif
448448
}
449449
}

0 commit comments

Comments
 (0)