comparison src/gtk/transfer.c @ 305:6d180e6a8ba5

2003-11-3 Brian Masney <[e-mail]> * lib/gftp.h src/gtk/transfer.c src/gtk/delete_dialog.c - removed transfer_direction variable from gftp_transfer structure. Cleaned up the code that did checks based on the value of this variable. * lib/rfc959.c (rfc959_syst) - added a check for Novell FTP servers * src/gtk/transfer.c (add_file_transfer) - check the value of the option one_transfer and if that is disabled, do not append the file transfers. (transfer_done) - refresh the destination window correctly after a transfer is completed.

304:95bcb77d62c1

    return;

  transfer = g_malloc0 (sizeof (*transfer));
  transfer->fromreq = copy_request (fromwdata->request, 0);
  transfer->toreq = copy_request (towdata->request, 0);
  transfer->transfer_direction = fromwdata == &window2 ? 
                           GFTP_DIRECTION_DOWNLOAD : GFTP_DIRECTION_UPLOAD;
  transfer->fromwdata = fromwdata;
  transfer->towdata = towdata;

  num = 0;
  templist = GTK_CLIST (fromwdata->listbox)->selection;

  transfer->fromreq->stopable = 0;
  return (GINT_TO_POINTER (success));
}


void * 
gftp_gtk_transfer_files (void *data)
{
  int i, mode, tofd, fromfd, preserve_permissions;
  gftp_transfer * transfer;

              transfer->curfle = transfer->curfle->next;
              g_static_mutex_unlock (&transfer->structmutex);
              continue;
            }

          if (curfle->is_fd)
            {
              if (transfer->transfer_direction == GFTP_DIRECTION_DOWNLOAD)
                {
                  tofd = curfle->fd;
                  fromfd = -1;
                }
              else
                {
                  tofd = -1;
                  fromfd = curfle->fd;
                }
            }
          else
            {
              tofd = -1;
              fromfd = -1;
            }

          if (curfle->size == 0)
            {
              curfle->size = gftp_get_file_size (transfer->fromreq, curfle->file);
              transfer->total_bytes += curfle->size;

                         transfer->fromreq, 
                         _("Error: Remote site disconnected after trying to transfer file\n"));
        }
      else if (fromsize < 0)
        {
          if (curfle->is_fd)
            {
              if (transfer->transfer_direction == GFTP_DIRECTION_DOWNLOAD)
                transfer->toreq->datafd = -1;
              else
                transfer->fromreq->datafd = -1;
            }

          g_static_mutex_lock (&transfer->structmutex);
          curfle->transfer_action = GFTP_TRANS_ACTION_SKIP;
          transfer->next_file = 1;
          transfer->curfle = transfer->curfle->next;
          g_static_mutex_unlock (&transfer->structmutex);

          break;
        }
      else
        {
          if (curfle->is_fd)
            {
              if (transfer->transfer_direction == GFTP_DIRECTION_DOWNLOAD)
                transfer->toreq->datafd = -1;
              else
                transfer->fromreq->datafd = -1;
            }

          if (gftp_end_transfer (transfer->fromreq) != 0)
            {
              if (gftp_get_transfer_status (transfer, -1) == GFTP_ERETRYABLE)
                continue;

gftp_transfer *
add_file_transfer (gftp_request * fromreq, gftp_request * toreq,
                   gftp_window_data * fromwdata, gftp_window_data * towdata, 
                   GList * files, int copy_req)
{
  int dialog, append_transfers;
  gftp_curtrans_data * transdata;
  GList * templist, *curfle;
  gftp_transfer * tdata;
  gftp_file * tempfle;
  char *pos, *text[2];

    }
  dialog = templist != NULL;

  gftp_lookup_request_option (fromreq, "append_transfers", 
                              &append_transfers);

  tdata = NULL;
  if (append_transfers)
    {
      pthread_mutex_lock (&transfer_mutex);
      for (templist = gftp_file_transfers; templist != NULL; templist = templist->next)
        {
          tdata = templist->data;

      else
        {
          tdata->fromreq = fromreq;
          tdata->toreq = toreq; 
        } 
      tdata->transfer_direction = fromwdata && fromwdata == &window1 ?
                            GFTP_DIRECTION_UPLOAD : GFTP_DIRECTION_DOWNLOAD;
      tdata->fromwdata = fromwdata;
      tdata->towdata = towdata;
      if (!dialog)
        tdata->show = tdata->ready = 1;
      tdata->files = files;

    {
      fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL;

      if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->fromwdata,
                                         tdata->fromreq))
        {
          gftp_swap_socks (((gftp_window_data *) tdata->fromwdata)->request, 
                           tdata->fromreq);
	  refresh (tdata->fromwdata);
        }
      else
	gftp_disconnect (tdata->fromreq);

      if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->towdata,
                                         tdata->toreq))
        {
          gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request, 
                           tdata->toreq);
	  refresh (tdata->towdata);
        }
      else
	gftp_disconnect (tdata->toreq);

      num_transfers_in_progress--;
    }

  if (!tdata->show && tdata->started)

void
gftp_gtk_ask_transfer (gftp_transfer * tdata)
{
  char *dltitles[4], *add_data[4] = { NULL, NULL, NULL, NULL },
       tempstr[50], temp1str[50], *pos, *title;
  GtkWidget * tempwid, * scroll, * hbox;
  int i, overwrite_default;
  gftp_file * tempfle;
  GList * templist;
  size_t len;

  dltitles[0] = _("Filename");
  dltitles[1] = _("Local Size");
  dltitles[2] = _("Remote Size");
  dltitles[3] = _("Action");
  title = tdata->transfer_direction == GFTP_DIRECTION_DOWNLOAD ?  
                               _("Download Files") : _("Upload Files");

#if GTK_MAJOR_VERSION == 1
  dialog = gtk_dialog_new ();
  gtk_grab_add (dialog);
  gtk_window_set_title (GTK_WINDOW (dialog), title);
  gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
  gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 35);
  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), TRUE);

  gtk_signal_connect_object (GTK_OBJECT (dialog), "delete_event",
                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
                             GTK_OBJECT (dialog));
#else
  dialog = gtk_dialog_new_with_buttons (title, NULL, 0, 
                                        GTK_STOCK_OK,
                                        GTK_RESPONSE_OK,
                                        GTK_STOCK_CANCEL,
                                        GTK_RESPONSE_CANCEL,
                                        NULL);

              add_data[3] = _("Resume");
              tempfle->transfer_action = GFTP_TRANS_ACTION_RESUME;
            }
        }

      if (tdata->transfer_direction == GFTP_DIRECTION_DOWNLOAD)
        {
          add_data[2] = insert_commas (tempfle->size, tempstr,
                                       sizeof (tempstr));
          add_data[1] = insert_commas (tempfle->startsize, temp1str,
                                       sizeof (temp1str));
        }
      else
        {
          add_data[1] = insert_commas (tempfle->size, tempstr,
                                       sizeof (tempstr));
          add_data[2] = insert_commas (tempfle->startsize, temp1str,
                                       sizeof (temp1str));
        }
      i = gtk_clist_append (GTK_CLIST (tdata->clist), add_data);
      gtk_clist_set_row_data (GTK_CLIST (tdata->clist), i, tempfle);
    }

  gtk_clist_select_all (GTK_CLIST (tdata->clist));

305:6d180e6a8ba5

    return;

  transfer = g_malloc0 (sizeof (*transfer));
  transfer->fromreq = copy_request (fromwdata->request, 0);
  transfer->toreq = copy_request (towdata->request, 0);
  transfer->fromwdata = fromwdata;
  transfer->towdata = towdata;

  num = 0;
  templist = GTK_CLIST (fromwdata->listbox)->selection;

  transfer->fromreq->stopable = 0;
  return (GINT_TO_POINTER (success));
}


static void
_gftp_setup_fds (gftp_transfer * tdata, gftp_file * curfle, 
                 int *fromfd, int *tofd)
{
  *tofd = -1;
  *fromfd = -1;

  if (curfle->is_fd)
    {
      if (tdata->toreq->protonum == GFTP_LOCAL_NUM)
        *tofd = curfle->fd;
      else if (tdata->fromreq->protonum == GFTP_LOCAL_NUM)
        *fromfd = curfle->fd;
    }
}


static void
_gftp_done_with_fds (gftp_transfer * tdata, gftp_file * curfle)
{
  if (curfle->is_fd)
    {
      if (tdata->toreq->protonum == GFTP_LOCAL_NUM)
        tdata->toreq->datafd = -1;
      else
        tdata->fromreq->datafd = -1;
    }
}


void * 
gftp_gtk_transfer_files (void *data)
{
  int i, mode, tofd, fromfd, preserve_permissions;
  gftp_transfer * transfer;

              transfer->curfle = transfer->curfle->next;
              g_static_mutex_unlock (&transfer->structmutex);
              continue;
            }

          _gftp_setup_fds (transfer, curfle, &fromfd, &tofd);

          if (curfle->size == 0)
            {
              curfle->size = gftp_get_file_size (transfer->fromreq, curfle->file);
              transfer->total_bytes += curfle->size;

                         transfer->fromreq, 
                         _("Error: Remote site disconnected after trying to transfer file\n"));
        }
      else if (fromsize < 0)
        {
          g_static_mutex_lock (&transfer->structmutex);
          curfle->transfer_action = GFTP_TRANS_ACTION_SKIP;
          transfer->next_file = 1;
          transfer->curfle = transfer->curfle->next;
          g_static_mutex_unlock (&transfer->structmutex);

          break;
        }
      else
        {
          _gftp_done_with_fds (transfer, curfle);
          if (gftp_end_transfer (transfer->fromreq) != 0)
            {
              if (gftp_get_transfer_status (transfer, -1) == GFTP_ERETRYABLE)
                continue;

gftp_transfer *
add_file_transfer (gftp_request * fromreq, gftp_request * toreq,
                   gftp_window_data * fromwdata, gftp_window_data * towdata, 
                   GList * files, int copy_req)
{
  int dialog, append_transfers, one_transfer;
  gftp_curtrans_data * transdata;
  GList * templist, *curfle;
  gftp_transfer * tdata;
  gftp_file * tempfle;
  char *pos, *text[2];

    }
  dialog = templist != NULL;

  gftp_lookup_request_option (fromreq, "append_transfers", 
                              &append_transfers);
  gftp_lookup_request_option (fromreq, "one_transfer", 
                              &one_transfer);

  tdata = NULL;
  if (append_transfers && one_transfer)
    {
      pthread_mutex_lock (&transfer_mutex);
      for (templist = gftp_file_transfers; templist != NULL; templist = templist->next)
        {
          tdata = templist->data;

      else
        {
          tdata->fromreq = fromreq;
          tdata->toreq = toreq; 
        } 

      tdata->fromwdata = fromwdata;
      tdata->towdata = towdata;
      if (!dialog)
        tdata->show = tdata->ready = 1;
      tdata->files = files;

    {
      fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL;

      if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->fromwdata,
                                         tdata->fromreq))
        gftp_swap_socks (((gftp_window_data *) tdata->fromwdata)->request, 
                         tdata->fromreq);
      else
	gftp_disconnect (tdata->fromreq);

      if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->towdata,
                                         tdata->toreq))
        gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request, 
                         tdata->toreq);
      else
	gftp_disconnect (tdata->toreq);

      if (tdata->towdata != NULL && compare_request (tdata->toreq,
                           ((gftp_window_data *) tdata->towdata)->request, 1))
        refresh (tdata->towdata);

      num_transfers_in_progress--;
    }

  if (!tdata->show && tdata->started)

void
gftp_gtk_ask_transfer (gftp_transfer * tdata)
{
  char *dltitles[4], *add_data[4] = { NULL, NULL, NULL, NULL },
       tempstr[50], temp1str[50], *pos;
  GtkWidget * tempwid, * scroll, * hbox;
  int i, overwrite_default;
  gftp_file * tempfle;
  GList * templist;
  size_t len;

  dltitles[0] = _("Filename");
  dltitles[1] = tdata->fromreq->hostname;
  dltitles[2] = tdata->toreq->hostname;
  dltitles[3] = _("Action");

#if GTK_MAJOR_VERSION == 1
  dialog = gtk_dialog_new ();
  gtk_grab_add (dialog);
  gtk_window_set_title (GTK_WINDOW (dialog), _("Transfer Files"));
  gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
  gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 35);
  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), TRUE);

  gtk_signal_connect_object (GTK_OBJECT (dialog), "delete_event",
                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
                             GTK_OBJECT (dialog));
#else
  dialog = gtk_dialog_new_with_buttons (_("Transfer Files"), NULL, 0, 
                                        GTK_STOCK_OK,
                                        GTK_RESPONSE_OK,
                                        GTK_STOCK_CANCEL,
                                        GTK_RESPONSE_CANCEL,
                                        NULL);

              add_data[3] = _("Resume");
              tempfle->transfer_action = GFTP_TRANS_ACTION_RESUME;
            }
        }

      add_data[1] = insert_commas (tempfle->size, tempstr, sizeof (tempstr));
      add_data[2] = insert_commas (tempfle->startsize, temp1str,
                                   sizeof (temp1str));

      i = gtk_clist_append (GTK_CLIST (tdata->clist), add_data);
      gtk_clist_set_row_data (GTK_CLIST (tdata->clist), i, tempfle);
    }

  gtk_clist_select_all (GTK_CLIST (tdata->clist));