Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add feature "rename" to xsend dialog. #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add feature "rename" to xsend dialog. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/UI/Motif/xsend_file/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ AM_CPPFLAGS = @AFD_MOTIF_INCLUDES@ -I../../.. -I../../common\
bin_PROGRAMS = xsend_file
xsend_file_SOURCES = callbacks.c\
create_url_file.c\
rr_file_name_file.c\
send_file.c\
xsend_file.c
xsend_file_LDADD = ../common/libmotifafd.a\
Expand Down
181 changes: 180 additions & 1 deletion src/UI/Motif/xsend_file/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ DESCR__S_M3
** HISTORY
** 24.01.2005 H.Kiehl Created
** 11.02.2014 A.Maul Properly set and unset active, passive mode.
** 02.01.2019 A.Maul Added select rename-rule with rename option.
**
*/
DESCR__E_M3
Expand Down Expand Up @@ -96,13 +97,83 @@ extern Widget active_passive_w,
statusbox_w,
timeout_label_w,
timeout_w,
rename_label_w[4],
rename_menu_w,
rename_toggle_w,
rename_onoff_w,
rename_filt_w,
rename_patt_w,
user_name_label_w,
user_name_w;
extern XtInputId cmd_input_id;
extern XmTextPosition wpr_position;
extern XmFontList fontlist;
extern struct send_data *db;
extern int no_of_rule_headers;
extern struct rule *rule;

/*############################ rename_toggle() ##########################*/
void
rename_onoff(Widget w, XtPointer client_data, XtPointer call_data)
{
XmString xstr;

if (db->rename_do & SET_RENAME_ON)
{
db->rename_do &= ~SET_RENAME_ON;
_set_rename_boxies(OFF);
xstr = XmStringCreateLtoR("Off", XmFONTLIST_DEFAULT_TAG);
XtVaSetValues(w, XmNlabelString, xstr, NULL);
XmStringFree(xstr);
}
else
{
db->rename_do |= SET_RENAME_ON;
_set_rename_boxies(ON);
xstr = XmStringCreateLtoR("On ", XmFONTLIST_DEFAULT_TAG);
XtVaSetValues(w, XmNlabelString, xstr, NULL);
XmStringFree(xstr);
}
return;
}

/*############################ rename_toggle() ##########################*/
void
rename_toggle(Widget w, XtPointer client_data, XtPointer call_data)
{
XmString xstr;

if (db->rename_do & SET_RENAME_MANUAL)
{
db->rename_do &= ~SET_RENAME_MANUAL;
db->rename_do |= SET_RENAME_RULE;
_set_rename_boxies(ON);
xstr = XmStringCreateLtoR("Rule ", XmFONTLIST_DEFAULT_TAG);
XtVaSetValues(w, XmNlabelString, xstr, NULL);
XmStringFree(xstr);
}
else
{
db->rename_do &= ~SET_RENAME_RULE;
db->rename_do |= SET_RENAME_MANUAL;
_set_rename_boxies(ON);
xstr = XmStringCreateLtoR("Manual", XmFONTLIST_DEFAULT_TAG);
XtVaSetValues(w, XmNlabelString, xstr, NULL);
XmStringFree(xstr);
}
return;
}

/*############################ rename_eval() ############################*/
void
rename_eval(Widget w, XtPointer client_data, XtPointer call_data)
{
XT_PTR_TYPE rule_num = (XT_PTR_TYPE)client_data;
if (rule_num < no_of_rule_headers)
{
db->rename_num = rule_num;
}
}

/*############################ close_button() ###########################*/
void
Expand Down Expand Up @@ -286,6 +357,36 @@ send_button(Widget w, XtPointer client_data, XtPointer call_data)
show_message(statusbox_w, "No protocol selected, or unknown.");
break;
}
/*
* check filter/pattern + rule, call rewrite file_name_file
*/
if (db->rename_do & SET_RENAME_ON)
{
if (db->rename_do & SET_RENAME_MANUAL)
{
if (db->rename_filt[0] == '\0')
{
show_message(statusbox_w, "No rename filter given!");
XmProcessTraversal(rename_filt_w, XmTRAVERSE_CURRENT);
return;
}
if (db->rename_patt[0] == '\0')
{
show_message(statusbox_w, "No rename pattern given!");
XmProcessTraversal(rename_patt_w, XmTRAVERSE_CURRENT);
return;
}
}
else
{
if (db->rename_num == INCORRECT)
{
show_message(statusbox_w, "Invalid rename-rule name!");
XmProcessTraversal(rename_menu_w, XmTRAVERSE_CURRENT);
return;
}
}
}

if (wpr_position != 0)
{
Expand All @@ -295,6 +396,37 @@ send_button(Widget w, XtPointer client_data, XtPointer call_data)
wpr_position = 0;
}
create_url_file();

if ((db->rename_do & SET_RENAME_ON) && (
(db->protocol == FTP) || (db->protocol == SFTP) || (db->protocol == LOC))
)
{
if (db->rename_do & SET_RENAME_RULE)
{
if (rr_file_name_file(rule, db->rename_num, NULL, NULL) == INCORRECT)
{
show_message(statusbox_w, "Evaluating rename-rule(s) failed!");
return;
}
}
if (db->rename_do & SET_RENAME_MANUAL)
{
if (rr_file_name_file(rule, -1, db->rename_filt, db->rename_patt) == INCORRECT)
{
show_message(statusbox_w, "Evaluating rename-rule( failed!");
return;
}
}
}
else
{
if (rr_file_name_file(rule, -1, NULL, NULL) == INCORRECT)
{
show_message(statusbox_w, "Resetting rename-rule evaluation failed!");
return;
}
}

send_file();

/* Set Stop button. */
Expand Down Expand Up @@ -360,6 +492,7 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
{
return;
}
db->protocol = (XT_PTR_TYPE)client_data;
switch ((XT_PTR_TYPE)client_data)
{
case FTP :
Expand Down Expand Up @@ -475,6 +608,8 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
XtSetSensitive(lock_box_w, True);
XtSetSensitive(prefix_w, True);

_set_rename_boxies(ON);

XmTextSetString(proxy_w, db->proxy_name);
XtSetSensitive(proxy_label_w, True);
XtSetSensitive(proxy_w, True);
Expand Down Expand Up @@ -594,6 +729,8 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
XtSetSensitive(lock_box_w, True);
XtSetSensitive(prefix_w, True);

_set_rename_boxies(ON);

XtSetSensitive(proxy_label_w, False);
XtSetSensitive(proxy_w, False);

Expand Down Expand Up @@ -722,6 +859,8 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
XtSetSensitive(lock_box_w, False);
XtSetSensitive(prefix_w, False);

_set_rename_boxies(OFF);

XtSetSensitive(proxy_label_w, False);
XtSetSensitive(proxy_w, False);
break;
Expand All @@ -747,6 +886,7 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
XtSetSensitive(mode_box_w, False);
XtSetSensitive(lock_box_w, True);
XtSetSensitive(prefix_w, True);
_set_rename_boxies(ON);
break;

#ifdef _WITH_SCP_SUPPORT
Expand All @@ -771,6 +911,7 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
XtSetSensitive(mode_box_w, False);
XtSetSensitive(lock_box_w, True);
XtSetSensitive(prefix_w, True);
_set_rename_boxies(ON);
if (db->port == 0)
{
char str_line[MAX_PORT_DIGITS + 1];
Expand Down Expand Up @@ -849,6 +990,8 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
XtSetSensitive(lock_box_w, False);
XtSetSensitive(prefix_w, False);

_set_rename_boxies(OFF);

XtSetSensitive(proxy_label_w, False);
XtSetSensitive(proxy_w, False);
break;
Expand All @@ -858,7 +1001,6 @@ protocol_toggled(Widget w, XtPointer client_data, XtPointer call_data)
(void)fprintf(stderr, "Junk programmer!\n");
exit(INCORRECT);
}
db->protocol = (XT_PTR_TYPE)client_data;

return;
}
Expand Down Expand Up @@ -1008,6 +1150,43 @@ send_save_input(Widget w, XtPointer client_data, XtPointer call_data)
XmProcessTraversal(w, XmTRAVERSE_NEXT_TAB_GROUP);
break;

/*
* save rename values
*/
case RENAME_FILT_NO_ENTER :
(void)strcpy(db->rename_filt, value);
break;
case RENAME_FILT_ENTER :
(void)strcpy(db->rename_filt, value);
reset_message(statusbox_w);
XmProcessTraversal(w, XmTRAVERSE_NEXT_TAB_GROUP);
break;

case RENAME_PATT_NO_ENTER :
(void)strcpy(db->rename_patt, value);
break;
case RENAME_PATT_ENTER :
(void)strcpy(db->rename_patt, value);
reset_message(statusbox_w);
XmProcessTraversal(w, XmTRAVERSE_NEXT_TAB_GROUP);
break;

case RENAME_RULE_NO_ENTER :
case RENAME_RULE_ENTER :
db->rename_num = get_rule(value, no_of_rule_headers);
if (db->rename_num == INCORRECT)
{
show_message(statusbox_w, "Invalid rename-rule name!");
XtFree(value);
return;
}
if (type == RENAME_RULE_ENTER)
{
XmProcessTraversal(w, XmTRAVERSE_NEXT_TAB_GROUP);
}
reset_message(statusbox_w);
break;

default :
(void)fprintf(stderr, "ERROR : Impossible! (%s %d)\n",
__FILE__, __LINE__);
Expand Down
Loading