Fixed a bug in mbfile pack/kill
This commit is contained in:
Michiel Broek
parent
94e0f7d7e1
commit
f5a9861ead
@ -17,6 +17,13 @@ v0.37.2 23-Feb-2003.
|
|||||||
mbfido:
|
mbfido:
|
||||||
Finding the inbound tic file now uses the new function.
|
Finding the inbound tic file now uses the new function.
|
||||||
|
|
||||||
|
mbfile:
|
||||||
|
When a file was deleted for age or download age, the 8.3
|
||||||
|
filename was not removed from disk.
|
||||||
|
A better check againts empty upload dates when purging files.
|
||||||
|
Also added a log when this happens. Please report if you see
|
||||||
|
any of these.
|
||||||
|
|
||||||
examples:
|
examples:
|
||||||
Removed the last menu item from the offline menu, added new
|
Removed the last menu item from the offline menu, added new
|
||||||
Extended Info toggle (English only).
|
Extended Info toggle (English only).
|
||||||
|
|||||||
386
mbfido/mbfkill.c
386
mbfido/mbfkill.c
@ -57,212 +57,210 @@ extern int do_pack; /* Perform pack */
|
|||||||
*/
|
*/
|
||||||
void Kill(void)
|
void Kill(void)
|
||||||
{
|
{
|
||||||
FILE *pAreas, *pFile, *pDest, *pTemp;
|
FILE *pAreas, *pFile, *pDest, *pTemp;
|
||||||
int i, iAreas, iAreasNew = 0;
|
int i, iAreas, iAreasNew = 0, iTotal = 0, iKilled = 0, iMoved = 0, rc, Killit, FilesLeft;
|
||||||
int iTotal = 0, iKilled = 0, iMoved = 0;
|
char *sAreas, *fAreas, *newdir = NULL, *sTemp, from[PATH_MAX], to[PATH_MAX];
|
||||||
char *sAreas, *fAreas, *newdir = NULL, *sTemp;
|
time_t Now;
|
||||||
time_t Now;
|
struct fileareas darea;
|
||||||
int rc, Killit, FilesLeft;
|
|
||||||
struct fileareas darea;
|
|
||||||
char from[PATH_MAX], to[PATH_MAX];
|
|
||||||
|
|
||||||
sAreas = calloc(PATH_MAX, sizeof(char));
|
sAreas = calloc(PATH_MAX, sizeof(char));
|
||||||
fAreas = calloc(PATH_MAX, sizeof(char));
|
fAreas = calloc(PATH_MAX, sizeof(char));
|
||||||
sTemp = calloc(PATH_MAX, sizeof(char));
|
sTemp = calloc(PATH_MAX, sizeof(char));
|
||||||
|
|
||||||
IsDoing("Kill files");
|
IsDoing("Kill files");
|
||||||
if (!do_quiet) {
|
if (!do_quiet) {
|
||||||
colour(3, 0);
|
colour(3, 0);
|
||||||
printf("Kill/move files...\n");
|
printf("Kill/move files...\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(sAreas, "%s/etc/fareas.data", getenv("MBSE_ROOT"));
|
sprintf(sAreas, "%s/etc/fareas.data", getenv("MBSE_ROOT"));
|
||||||
|
|
||||||
if ((pAreas = fopen (sAreas, "r")) == NULL) {
|
if ((pAreas = fopen (sAreas, "r")) == NULL) {
|
||||||
WriteError("Can't open %s", sAreas);
|
WriteError("Can't open %s", sAreas);
|
||||||
die(MBERR_INIT_ERROR);
|
die(MBERR_INIT_ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
fread(&areahdr, sizeof(areahdr), 1, pAreas);
|
fread(&areahdr, sizeof(areahdr), 1, pAreas);
|
||||||
fseek(pAreas, 0, SEEK_END);
|
fseek(pAreas, 0, SEEK_END);
|
||||||
iAreas = (ftell(pAreas) - areahdr.hdrsize) / areahdr.recsize;
|
iAreas = (ftell(pAreas) - areahdr.hdrsize) / areahdr.recsize;
|
||||||
Now = time(NULL);
|
Now = time(NULL);
|
||||||
|
|
||||||
for (i = 1; i <= iAreas; i++) {
|
for (i = 1; i <= iAreas; i++) {
|
||||||
|
|
||||||
fseek(pAreas, ((i-1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET);
|
fseek(pAreas, ((i-1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET);
|
||||||
fread(&area, areahdr.recsize, 1, pAreas);
|
fread(&area, areahdr.recsize, 1, pAreas);
|
||||||
|
|
||||||
if ((area.Available) && (area.DLdays || area.FDdays) && (!area.CDrom)) {
|
if ((area.Available) && (area.DLdays || area.FDdays) && (!area.CDrom)) {
|
||||||
|
|
||||||
if (!diskfree(CFG.freespace))
|
if (!diskfree(CFG.freespace))
|
||||||
die(MBERR_DISK_FULL);
|
die(MBERR_DISK_FULL);
|
||||||
|
|
||||||
if (!do_quiet) {
|
if (!do_quiet) {
|
||||||
printf("\r%4d => %-44s \b\b\b\b", i, area.Name);
|
printf("\r%4d => %-44s \b\b\b\b", i, area.Name);
|
||||||
fflush(stdout);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Check if download directory exists,
|
|
||||||
* if not, create the directory.
|
|
||||||
*/
|
|
||||||
if (access(area.Path, R_OK) == -1) {
|
|
||||||
Syslog('!', "Create dir: %s", area.Path);
|
|
||||||
newdir = xstrcpy(area.Path);
|
|
||||||
newdir = xstrcat(newdir, (char *)"/");
|
|
||||||
mkdirs(newdir, 0755);
|
|
||||||
free(newdir);
|
|
||||||
newdir = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
sprintf(fAreas, "%s/fdb/fdb%d.data", getenv("MBSE_ROOT"), i);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Open the file database, if it doesn't exist,
|
|
||||||
* create an empty one.
|
|
||||||
*/
|
|
||||||
if ((pFile = fopen(fAreas, "r+")) == NULL) {
|
|
||||||
Syslog('!', "Creating new %s", fAreas);
|
|
||||||
if ((pFile = fopen(fAreas, "a+")) == NULL) {
|
|
||||||
WriteError("$Can't create %s", fAreas);
|
|
||||||
die(MBERR_GENERAL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Now start checking the files in the filedatabase
|
|
||||||
* against the contents of the directory.
|
|
||||||
*/
|
|
||||||
while (fread(&file, sizeof(file), 1, pFile) == 1) {
|
|
||||||
iTotal++;
|
|
||||||
Marker();
|
|
||||||
|
|
||||||
Killit = FALSE;
|
|
||||||
if (area.DLdays) {
|
|
||||||
/*
|
|
||||||
* Test last download date or never downloaded and the
|
|
||||||
* file is more then n days available for download.
|
|
||||||
*/
|
|
||||||
if ((file.LastDL) &&
|
|
||||||
(((Now - file.LastDL) / 84400) > area.DLdays)) {
|
|
||||||
Killit = TRUE;
|
|
||||||
}
|
|
||||||
if ((!file.LastDL) &&
|
|
||||||
(((Now - file.UploadDate) / 84400) > area.DLdays)) {
|
|
||||||
Killit = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (area.FDdays) {
|
|
||||||
/*
|
|
||||||
* Check filedate
|
|
||||||
*/
|
|
||||||
if (((Now - file.UploadDate) / 84400) > area.FDdays) {
|
|
||||||
Killit = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Killit) {
|
|
||||||
do_pack = TRUE;
|
|
||||||
if (area.MoveArea) {
|
|
||||||
fseek(pAreas, ((area.MoveArea -1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET);
|
|
||||||
fread(&darea, areahdr.recsize, 1, pAreas);
|
|
||||||
sprintf(from, "%s/%s", area.Path, file.Name);
|
|
||||||
sprintf(to, "%s/%s", darea.Path, file.Name);
|
|
||||||
if ((rc = file_mv(from, to)) == 0) {
|
|
||||||
Syslog('+', "Move %s, area %d => %d", file.Name, i, area.MoveArea);
|
|
||||||
sprintf(to, "%s/fdb/fdb%d.data", getenv("MBSE_ROOT"), area.MoveArea);
|
|
||||||
if ((pDest = fopen(to, "a+")) != NULL) {
|
|
||||||
file.UploadDate = time(NULL);
|
|
||||||
file.LastDL = time(NULL);
|
|
||||||
fwrite(&file, sizeof(file), 1, pDest);
|
|
||||||
fclose(pDest);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Now again if there is a dotted version (thumbnail) of this file.
|
|
||||||
*/
|
|
||||||
sprintf(from, "%s/.%s", area.Path, file.Name);
|
|
||||||
sprintf(to, "%s/.%s", darea.Path, file.Name);
|
|
||||||
if (file_exist(from, R_OK) == 0)
|
|
||||||
file_mv(from, to);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Unlink the old symbolic link
|
|
||||||
*/
|
|
||||||
sprintf(from, "%s/%s", area.Path, file.LName);
|
|
||||||
unlink(from);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Create the new symbolic link
|
|
||||||
*/
|
|
||||||
sprintf(from, "%s/%s", darea.Path, file.Name);
|
|
||||||
sprintf(to, "%s/%s", darea.Path, file.LName);
|
|
||||||
symlink(from, to);
|
|
||||||
|
|
||||||
file.Deleted = TRUE;
|
|
||||||
fseek(pFile, - sizeof(file), SEEK_CUR);
|
|
||||||
fwrite(&file, sizeof(file), 1, pFile);
|
|
||||||
iMoved++;
|
|
||||||
} else {
|
|
||||||
WriteError("Move %s to area %d failed, %s",
|
|
||||||
file.Name, area.MoveArea, strerror(rc));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Syslog('+', "Delete %s, area %d", file.LName, i);
|
|
||||||
file.Deleted = TRUE;
|
|
||||||
fseek(pFile, - sizeof(file), SEEK_CUR);
|
|
||||||
fwrite(&file, sizeof(file), 1, pFile);
|
|
||||||
iKilled++;
|
|
||||||
sprintf(from, "%s/%s", area.Path, file.LName);
|
|
||||||
unlink(from);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Now we must pack this area database otherwise
|
|
||||||
* we run into trouble later on.
|
|
||||||
*/
|
|
||||||
fseek(pFile, 0, SEEK_SET);
|
|
||||||
sprintf(sTemp, "%s/fdb/fdbtmp.data", getenv("MBSE_ROOT"));
|
|
||||||
|
|
||||||
if ((pTemp = fopen(sTemp, "a+")) != NULL) {
|
|
||||||
FilesLeft = FALSE;
|
|
||||||
while (fread(&file, sizeof(file), 1, pFile) == 1) {
|
|
||||||
if ((!file.Deleted) && strcmp(file.LName, "") != 0) {
|
|
||||||
fwrite(&file, sizeof(file), 1, pTemp);
|
|
||||||
FilesLeft = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fclose(pFile);
|
|
||||||
fclose(pTemp);
|
|
||||||
if ((rename(sTemp, fAreas)) == 0) {
|
|
||||||
unlink(sTemp);
|
|
||||||
chmod(fAreas, 006600);
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
fclose(pFile);
|
|
||||||
|
|
||||||
iAreasNew++;
|
|
||||||
|
|
||||||
} /* if area.Available */
|
|
||||||
}
|
|
||||||
|
|
||||||
fclose(pAreas);
|
|
||||||
|
|
||||||
Syslog('+', "Kill Areas [%5d] Files [%5d] Deleted [%5d] Moved [%5d]", iAreasNew, iTotal, iKilled, iMoved);
|
|
||||||
|
|
||||||
if (!do_quiet) {
|
|
||||||
printf("\r \r");
|
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
|
|
||||||
free(sTemp);
|
/*
|
||||||
free(sAreas);
|
* Check if download directory exists, if not, create the directory.
|
||||||
free(fAreas);
|
*/
|
||||||
|
if (access(area.Path, R_OK) == -1) {
|
||||||
|
Syslog('!', "Create dir: %s", area.Path);
|
||||||
|
newdir = xstrcpy(area.Path);
|
||||||
|
newdir = xstrcat(newdir, (char *)"/");
|
||||||
|
mkdirs(newdir, 0755);
|
||||||
|
free(newdir);
|
||||||
|
newdir = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
sprintf(fAreas, "%s/fdb/fdb%d.data", getenv("MBSE_ROOT"), i);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Open the file database, if it doesn't exist,
|
||||||
|
* create an empty one.
|
||||||
|
*/
|
||||||
|
if ((pFile = fopen(fAreas, "r+")) == NULL) {
|
||||||
|
Syslog('!', "Creating new %s", fAreas);
|
||||||
|
if ((pFile = fopen(fAreas, "a+")) == NULL) {
|
||||||
|
WriteError("$Can't create %s", fAreas);
|
||||||
|
die(MBERR_GENERAL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Now start checking the files in the filedatabase
|
||||||
|
* against the contents of the directory.
|
||||||
|
*/
|
||||||
|
while (fread(&file, sizeof(file), 1, pFile) == 1) {
|
||||||
|
iTotal++;
|
||||||
|
Marker();
|
||||||
|
|
||||||
|
Killit = FALSE;
|
||||||
|
if (!file.UploadDate)
|
||||||
|
Syslog('!', "Warning: file %s in area %d has no upload date", file.Name, i);
|
||||||
|
|
||||||
|
if (area.DLdays) {
|
||||||
|
/*
|
||||||
|
* Test last download date or never downloaded and the
|
||||||
|
* file is more then n days available for download.
|
||||||
|
*/
|
||||||
|
if ((file.LastDL) && (((Now - file.LastDL) / 84400) > area.DLdays)) {
|
||||||
|
Killit = TRUE;
|
||||||
|
}
|
||||||
|
if ((!file.LastDL) && file.UploadDate && (((Now - file.UploadDate) / 84400) > area.DLdays)) {
|
||||||
|
Killit = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (area.FDdays) {
|
||||||
|
/*
|
||||||
|
* Check filedate
|
||||||
|
*/
|
||||||
|
if (file.UploadDate && (((Now - file.UploadDate) / 84400) > area.FDdays)) {
|
||||||
|
Killit = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Killit) {
|
||||||
|
do_pack = TRUE;
|
||||||
|
if (area.MoveArea) {
|
||||||
|
fseek(pAreas, ((area.MoveArea -1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET);
|
||||||
|
fread(&darea, areahdr.recsize, 1, pAreas);
|
||||||
|
sprintf(from, "%s/%s", area.Path, file.Name);
|
||||||
|
sprintf(to, "%s/%s", darea.Path, file.Name);
|
||||||
|
if ((rc = file_mv(from, to)) == 0) {
|
||||||
|
Syslog('+', "Move %s, area %d => %d", file.Name, i, area.MoveArea);
|
||||||
|
sprintf(to, "%s/fdb/fdb%d.data", getenv("MBSE_ROOT"), area.MoveArea);
|
||||||
|
if ((pDest = fopen(to, "a+")) != NULL) {
|
||||||
|
file.UploadDate = time(NULL);
|
||||||
|
file.LastDL = time(NULL);
|
||||||
|
fwrite(&file, sizeof(file), 1, pDest);
|
||||||
|
fclose(pDest);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Now again if there is a dotted version (thumbnail) of this file.
|
||||||
|
*/
|
||||||
|
sprintf(from, "%s/.%s", area.Path, file.Name);
|
||||||
|
sprintf(to, "%s/.%s", darea.Path, file.Name);
|
||||||
|
if (file_exist(from, R_OK) == 0)
|
||||||
|
file_mv(from, to);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Unlink the old symbolic link
|
||||||
|
*/
|
||||||
|
sprintf(from, "%s/%s", area.Path, file.LName);
|
||||||
|
unlink(from);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Create the new symbolic link
|
||||||
|
*/
|
||||||
|
sprintf(from, "%s/%s", darea.Path, file.Name);
|
||||||
|
sprintf(to, "%s/%s", darea.Path, file.LName);
|
||||||
|
symlink(from, to);
|
||||||
|
|
||||||
|
file.Deleted = TRUE;
|
||||||
|
fseek(pFile, - sizeof(file), SEEK_CUR);
|
||||||
|
fwrite(&file, sizeof(file), 1, pFile);
|
||||||
|
iMoved++;
|
||||||
|
} else {
|
||||||
|
WriteError("Move %s to area %d failed, %s", file.Name, area.MoveArea, strerror(rc));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Syslog('+', "Delete %s, area %d", file.LName, i);
|
||||||
|
file.Deleted = TRUE;
|
||||||
|
fseek(pFile, - sizeof(file), SEEK_CUR);
|
||||||
|
fwrite(&file, sizeof(file), 1, pFile);
|
||||||
|
iKilled++;
|
||||||
|
sprintf(from, "%s/%s", area.Path, file.LName);
|
||||||
|
unlink(from);
|
||||||
|
sprintf(from, "%s/%s", area.Path, file.Name);
|
||||||
|
unlink(from);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Now we must pack this area database otherwise
|
||||||
|
* we run into trouble later on.
|
||||||
|
*/
|
||||||
|
fseek(pFile, 0, SEEK_SET);
|
||||||
|
sprintf(sTemp, "%s/fdb/fdbtmp.data", getenv("MBSE_ROOT"));
|
||||||
|
|
||||||
|
if ((pTemp = fopen(sTemp, "a+")) != NULL) {
|
||||||
|
FilesLeft = FALSE;
|
||||||
|
while (fread(&file, sizeof(file), 1, pFile) == 1) {
|
||||||
|
if ((!file.Deleted) && strcmp(file.LName, "") != 0) {
|
||||||
|
fwrite(&file, sizeof(file), 1, pTemp);
|
||||||
|
FilesLeft = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose(pFile);
|
||||||
|
fclose(pTemp);
|
||||||
|
if ((rename(sTemp, fAreas)) == 0) {
|
||||||
|
unlink(sTemp);
|
||||||
|
chmod(fAreas, 006600);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
fclose(pFile);
|
||||||
|
|
||||||
|
iAreasNew++;
|
||||||
|
|
||||||
|
} /* if area.Available */
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose(pAreas);
|
||||||
|
|
||||||
|
Syslog('+', "Kill Areas [%5d] Files [%5d] Deleted [%5d] Moved [%5d]", iAreasNew, iTotal, iKilled, iMoved);
|
||||||
|
|
||||||
|
if (!do_quiet) {
|
||||||
|
printf("\r \r");
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
|
||||||
|
free(sTemp);
|
||||||
|
free(sAreas);
|
||||||
|
free(fAreas);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user