Evolinx/appstream-generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronise downloading of files

Browse Source 
If multiple threads try to download the same file, then one of them will
get an incomplete file since `downloadFile` will return early if the
dest exists, which is does while the download is in progress.
This commit is contained in:
Iain Lane 2016-09-20 11:40:26 +01:00
parent 29588381dc
commit 469182f8ba
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/backends/debian/debpkg.d
View File

@ -62,7 +62,9 @@ public:
@property string filename () const {
if (debFname.isRemote) {
immutable path = buildNormalizedPath (tmpDir, debFname.baseName);
downloadFile (debFname, path);
synchronized (this) {
downloadFile (debFname, path);
}
return path;
}
return debFname;

22
source/backends/debian/debpkgindex.d
View File

@ -74,15 +74,17 @@ public:
bool[string] ret;
try {
const inReleaseContents = getFileContents (inRelease);
synchronized (this) {
const inReleaseContents = getFileContents (inRelease);
foreach (const ref entry; inReleaseContents) {
auto match = entry.matchFirst (translationregex);
foreach (const ref entry; inReleaseContents) {
auto match = entry.matchFirst (translationregex);
if (match.empty)
continue;
if (match.empty)
continue;
ret[match[1]] = true;
ret[match[1]] = true;
}
}
} catch (Exception ex) {
logWarning ("Could not get %s, will assume 'en' is available.", inRelease);
@ -112,7 +114,9 @@ public:
"Translation-%s.%s".format(lang, "%s"));
try {
fname = downloadIfNecessary (rootDir, tmpDir, fullPath);
synchronized (this) {
fname = downloadIfNecessary (rootDir, tmpDir, fullPath);
}
} catch (Exception ex) {
logDebug ("No translations for %s in %s/%s", lang, suite, section);
continue;
@ -175,7 +179,9 @@ public:
{
immutable path = buildPath ("dists", suite, section, "binary-%s".format (arch));
return downloadIfNecessary (rootDir, tmpDir, buildPath (path, "Packages.%s"));
synchronized (this) {
return downloadIfNecessary (rootDir, tmpDir, buildPath (path, "Packages.%s"));
}
}
protected DebPackage newPackage (string name, string ver, string arch)