bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added files area move and path move

Browse Source
This commit is contained in:
Michiel Broek 2002-02-18 15:19:10 +00:00
parent ed20c3a0fa
commit a53680bcfc
6 changed files with 195 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -4606,6 +4606,9 @@ v0.33.20 10-Feb-2002
Layout for message area editor changed, more logical now. Layout for message area editor changed, more logical now.
If selecting a file/mailgroup in node edit that is outside the If selecting a file/mailgroup in node edit that is outside the
visible range of groups, the view is adjusted. visible range of groups, the view is adjusted.
If changing the path in an existing file area, the files in
that area are moved to the new path.
It is now possible to move file areas.
mbfido: mbfido:
In AreaMgr and FileMgr changed aka matching for area In AreaMgr and FileMgr changed aka matching for area

11
html/setup/files.html
View File

@ -12,7 +12,7 @@
</HEAD> </HEAD>
<BODY> <BODY>
<BLOCKQUOTE> <BLOCKQUOTE>
<h5>Last update 16-Dec-2001</h5> <h5>Last update 18-Feb-2002</h5>
<P>&nbsp;<P> <P>&nbsp;<P>
<H1>MBSE BBS Setup - BBS Setup - File Areas.</H1> <H1>MBSE BBS Setup - BBS Setup - File Areas.</H1>
@ -21,12 +21,13 @@
<H3>File Areas introduction.</H3> <H3>File Areas introduction.</H3>
<P> <P>
This is the setup for the file areas in which users can up and download files. This is the setup for the file areas in which users can up and download files.
This database has fixed area numbers, the database can't be packed. This is This database has fixed area numbers, the database can't be packed.
done because areas can point to other areas and users are "used" to use Extending the database is allways possible. One important note,
areas by number. Also the .tic areas reference the file areas by record
numbers. Extending the database is allways possible. One important note,
before you can set this up, you need to define the <A HREF="newgroups.html"> before you can set this up, you need to define the <A HREF="newgroups.html">
newfiles groups</A>. newfiles groups</A>.
<P>
If you change the path in an existing area, all files in that area are automatic
moved to the new location.
<P>&nbsp;<p> <P>&nbsp;<p>
<H3>File Areas Setup.</H3> <H3>File Areas Setup.</H3>

50
mbsetup/ledit.c
View File

@ -443,6 +443,56 @@ char *select_area(int max, int items)
char *select_filearea(int max, int items)
{
static char s[12];
static char *menu=(char *)"-";
char help[81];
int pick;
memset((char *)s, 0, 12);
if (max == 0)
sprintf(help, "^\"-\"^ back, ^A^ppend");
else
if (max > items)
sprintf(help, "Record (1..%d), ^\"-\"^ back, ^A^ppend, ^M^ove, ^N^ext, ^P^revious", max);
else
sprintf(help, "Record (1..%d), ^\"-\"^ back, ^A^ppend, ^M^ove", max);
showhelp(help);
/*
* Loop until the answer is right
*/
for (;;) {
mvprintw(LINES - 3, 6, "Enter your choice >");
menu = (char *)"-";
menu = edit_field(LINES - 3, 26, 6, '!', menu);
locate(LINES - 3, 6);
clrtoeol();
if (strncmp(menu, "A", 1) == 0)
break;
if (strncmp(menu, "-", 1) == 0)
break;
if ((strncmp(menu, "M", 1) == 0) && max)
break;
if (max > items) {
if (strncmp(menu, "N", 1) == 0)
break;
if (strncmp(menu, "P", 1) == 0)
break;
}
pick = atoi(menu);
if ((pick >= 1) && (pick <= max))
break;
}
return menu;
}
char *select_pick(int max, int items) char *select_pick(int max, int items)
{ {
static char s[12]; static char s[12];

1
mbsetup/ledit.h
View File

@ -9,6 +9,7 @@ void show_field(int, int, char *, int, int);
void newinsert(int, int, int); void newinsert(int, int, int);
char *edit_field(int, int, int, int, char *); char *edit_field(int, int, int, int, char *);
char *select_record(int, int); char *select_record(int, int);
char *select_filearea(int, int);
char *select_area(int, int); char *select_area(int, int);
char *select_pick(int, int); char *select_pick(int, int);
char *select_show(int); char *select_show(int);

142
mbsetup/m_farea.c
View File

@ -46,6 +46,8 @@
int FileUpdated = 0; int FileUpdated = 0;
int FileForced = FALSE;
/* /*
@ -245,10 +247,13 @@ void FileScreen(void)
int EditFileRec(int Area) int EditFileRec(int Area)
{ {
FILE *fil, *fp; FILE *fil, *fp;
char mfile[PATH_MAX], *temp; char mfile[PATH_MAX], *temp, tpath[65], frpath[81], topath[81];
long offset; long offset;
unsigned long crc, crc1; unsigned long crc, crc1;
int Available, files; int Available, files, rc, Force = FALSE, count;
DIR *dp;
struct dirent *de;
struct stat stb;
clr_index(); clr_index();
working(1, 0, 0); working(1, 0, 0);
@ -306,11 +311,10 @@ int EditFileRec(int Area)
show_int(17,73, area.Upload); show_int(17,73, area.Upload);
switch(select_menu(26)) { switch(select_menu(26)) {
case 0: case 0: crc1 = 0xffffffff;
crc1 = 0xffffffff;
crc1 = upd_crc32((char *)&area, crc1, areahdr.recsize); crc1 = upd_crc32((char *)&area, crc1, areahdr.recsize);
if (crc != crc1) { if (crc != crc1) {
if (yes_no((char *)"Record is changed, save") == 1) { if (Force || yes_no((char *)"Record is changed, save") == 1) {
working(1, 0, 0); working(1, 0, 0);
if ((fil = fopen(mfile, "r+")) == NULL) { if ((fil = fopen(mfile, "r+")) == NULL) {
working(2, 0, 0); working(2, 0, 0);
@ -320,13 +324,46 @@ int EditFileRec(int Area)
fwrite(&area, areahdr.recsize, 1, fil); fwrite(&area, areahdr.recsize, 1, fil);
fclose(fil); fclose(fil);
FileUpdated = 1; FileUpdated = 1;
Syslog('+', "Updated file area %d", Area);
working(0, 0, 0); working(0, 0, 0);
} }
} }
IsDoing("Browsing Menu"); IsDoing("Browsing Menu");
return 0; return 0;
case 1: E_STR( 6,16,44, area.Name, "The ^name^ for this area") case 1: E_STR( 6,16,44, area.Name, "The ^name^ for this area")
case 2: E_PTH( 7,16,64, area.Path, "The ^path^ for the files in this area") case 2: strcpy(tpath, area.Path);
strcpy(area.Path, edit_pth(7,16,64, area.Path, (char *)"The ^path^ for the files in this area"));
if (strlen(tpath) && strlen(area.Path) && strcmp(tpath, area.Path)) {
if ((dp = opendir(tpath)) == NULL) {
WriteError("Can't open directory %s", tpath);
} else {
working(5, 0, 0);
count = 0;
Syslog('+', "Moving files from %s to %s", tpath, area.Path);
while ((de = readdir(dp))) {
sprintf(frpath, "%s/%s", tpath, de->d_name);
sprintf(topath, "%s/%s", area.Path, de->d_name);
if (stat(frpath, &stb) == 0) {
if (S_ISREG(stb.st_mode)) {
rc = file_mv(frpath, topath);
if (rc)
WriteError("mv %s to %s rc=%d", frpath, topath, rc);
else
count++;
Nopper();
}
}
}
closedir(dp);
if ((rc = rmdir(tpath)))
WriteError("rmdir %s rc=%d", tpath, rc);
Force = TRUE;
FileForced = TRUE;
Syslog('+', "Moved %d files", count);
working(0, 0, 0);
}
}
break;
case 3: E_SEC( 8,16, area.DLSec, "8.4.3 DOWNLOAD SECURITY", FileScreen) case 3: E_SEC( 8,16, area.DLSec, "8.4.3 DOWNLOAD SECURITY", FileScreen)
case 4: E_SEC( 9,16, area.UPSec, "8.4.4 UPLOAD SECURITY", FileScreen) case 4: E_SEC( 9,16, area.UPSec, "8.4.4 UPLOAD SECURITY", FileScreen)
case 5: E_SEC( 10,16, area.LTSec, "8.4.5 LIST SECURITY", FileScreen) case 5: E_SEC( 10,16, area.LTSec, "8.4.5 LIST SECURITY", FileScreen)
@ -363,6 +400,7 @@ int EditFileRec(int Area)
*/ */
sprintf(temp, "rm -r -f %s", area.Path); sprintf(temp, "rm -r -f %s", area.Path);
system(temp); system(temp);
rmdir(area.Path);
} }
memset(&area, 0, sizeof(area)); memset(&area, 0, sizeof(area));
/* /*
@ -423,11 +461,11 @@ int EditFileRec(int Area)
void EditFilearea(void) void EditFilearea(void)
{ {
int records, i, o, x, y; int records, i, o, x, y, count;
char pick[12]; char pick[12];
FILE *fil; FILE *fil, *tfil;
char temp[PATH_MAX]; char temp[PATH_MAX], new[PATH_MAX];
long offset; long offset, from, too;
clr_index(); clr_index();
working(1, 0, 0); working(1, 0, 0);
@ -486,10 +524,10 @@ void EditFilearea(void)
} }
} }
working(0, 0, 0); working(0, 0, 0);
strcpy(pick, select_record(records, 20)); strcpy(pick, select_filearea(records, 20));
if (strncmp(pick, "-", 1) == 0) { if (strncmp(pick, "-", 1) == 0) {
CloseFilearea(FALSE); CloseFilearea(FileForced);
return; return;
} }
@ -503,6 +541,86 @@ void EditFilearea(void)
working(0, 0, 0); working(0, 0, 0);
} }
if (strncmp(pick, "M", 1) == 0) {
from = too = 0;
mvprintw(LINES -3, 5, "From");
from = edit_int(LINES -3, 10, from, (char *)"Wich ^area^ you want to move");
mvprintw(LINES -3,15, "To");
too = edit_int(LINES -3, 18, too, (char *)"Too which ^area^ to move");
sprintf(temp, "%s/etc/fareas.temp", getenv("MBSE_ROOT"));
if ((fil = fopen(temp, "r+")) != NULL) {
fread(&areahdr, sizeof(areahdr), 1, fil);
offset = areahdr.hdrsize + ((from - 1) * areahdr.recsize);
if ((fseek(fil, offset, 0) != 0) || (fread(&area, areahdr.recsize, 1, fil) != 1) ||
(area.Available == FALSE)) {
errmsg((char *)"The originating area is invalid");
} else {
offset = areahdr.hdrsize + ((too - 1) * areahdr.recsize);
if ((fseek(fil, offset, 0) != 0) || (fread(&area, areahdr.recsize, 1, fil) != 1) ||
area.Available) {
errmsg((char *)"The destination area is invalid");
} else {
/*
* Move the area now
*/
working(5, 0, 0);
offset = areahdr.hdrsize + ((from - 1) * areahdr.recsize);
fseek(fil, offset, 0);
fread(&area, areahdr.recsize, 1, fil);
offset = areahdr.hdrsize + ((too - 1) * areahdr.recsize);
fseek(fil, offset, 0);
fwrite(&area, areahdr.recsize, 1, fil);
memset(&area, 0, sizeof(area));
/*
* Fill in default values
*/
area.New = TRUE;
area.Dupes = TRUE;
area.FileFind = TRUE;
area.AddAlpha = TRUE;
area.FileReq = TRUE;
strcpy(area.Path, CFG.ftp_base);
FileUpdated = 1;
offset = areahdr.hdrsize + ((from - 1) * areahdr.recsize);
fseek(fil, offset, 0);
fwrite(&area, areahdr.recsize, 1, fil);
sprintf(temp, "%s/fdb/fdb%ld.data", getenv("MBSE_ROOT"), from);
sprintf(new, "%s/fdb/fdb%ld.data", getenv("MBSE_ROOT"), too);
rename(temp, new);
/*
* Force databse update, don't let the user decide or he will
* loose all files from the moved areas.
*/
FileForced = TRUE;
/*
* Update references in tic areas to this filearea.
*/
sprintf(temp, "%s/etc/tic.data", getenv("MBSE_ROOT"));
if ((tfil = fopen(temp, "r+")) == NULL) {
WriteError("Can't update %s", temp);
} else {
count = 0;
fread(&tichdr, sizeof(tichdr), 1, tfil);
while (fread(&tic, tichdr.recsize, 1, tfil) == 1) {
if (tic.Active && (tic.FileArea == from)) {
tic.FileArea = too;
fseek(tfil, - tichdr.recsize, SEEK_CUR);
fwrite(&tic, tichdr.recsize, 1, tfil);
count++;
}
fseek(tfil, tichdr.syssize, SEEK_CUR);
}
fclose(tfil);
Syslog('+', "Updated %d ticareas", count);
}
working(0, 0, 0);
}
}
fclose(fil);
}
}
if (strncmp(pick, "N", 1) == 0) if (strncmp(pick, "N", 1) == 0)
if ((o + 20) < records) if ((o + 20) < records)
o = o + 20; o = o + 20;

2
mbsetup/screen.c
View File

@ -216,6 +216,8 @@ void working(int txno, int y, int x)
fflush(stdout); fflush(stdout);
sleep(1); sleep(1);
break; break;
case 5: mvprintw(4, 66, (char *)"Moving . . . ");
break;
} }
show_date(LIGHTGRAY, BLACK, 0, 0); show_date(LIGHTGRAY, BLACK, 0, 0);