[zoom]

it might happen that a copied ed2k-link contain whitespaces at the end, especially after copying a link from a website.

add this line in DirectDownloadDlg.cpp to fix this (marked in red)

Quote

void CDirectDownloadDlg::OnOK()
{
CString strLinks;
GetDlgItem(IDC_ELINK)->GetWindowText(strLinks);

int curPos = 0;
CString strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
while (!strTok.IsEmpty())
{
  strTok.Trim();
  if (strTok.Right(1) != _T("/"))
   strTok += _T("/");
  try
  ...

cheers

zoom

This post has been edited by zoom: 30 July 2006 - 03:50 PM

[netfinity]

You need to use a qoute to do that!

[zoom]

thanks for your help

[tHeWiZaRdOfDoS]

If I may add it might be even better to do this:

Quote

CString strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
while (!strTok.IsEmpty())
{
  strTok.Trim();
  if(strTok.IsEmpty())
    break;
  if (strTok.Right(1) != _T("/"))
  strTok += _T("/");
  try
  ...

as a line might contain only spaces.

[zoom]

good input

this way it might be even better:

Quote

CString strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
while (!strTok.IsEmpty())
{
  strTok.Trim();
  if(strTok.IsEmpty())
    continue;
  if (strTok.Right(1) != _T("/"))
  strTok += _T("/");
  try
  ...

just in cases that there is another link after the empty line...

[tHeWiZaRdOfDoS]

Considering that the official client "throws" on error I thought a break would be ok *g
One can change that part then, too

[Aenarion[ITA]]

zoom, on Jul 31 2006, 08:44 PM, said:

good input 

this way it might be even better:

Quote

CString strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
while (!strTok.IsEmpty())
{
  strTok.Trim();
  if(strTok.IsEmpty())
    continue;
  if (strTok.Right(1) != _T("/"))
  strTok += _T("/");
  try
  ...

just in cases that there is another link after the empty line...

Why this "if"??
the control to determine if strTok is empy comes made already from the "while".

[CiccioBastardo]

Because before the trim strTok can be not empty. After the trim it can be. If it is, the following code lines are useless.
I can't understand the continue, instead. Used that way the next line of the string will never be tokenized.
You need:

Quote

strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);

before the continue.

Or I am missing something?

/edit: to complete the example:

Quote

CString strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
while (!strTok.IsEmpty())
{
  strTok.Trim();
  if(strTok.IsEmpty()) {
    strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
    continue;
  }
  if (strTok.Right(1) != _T("/"))
  strTok += _T("/");
  try
  ...

Which can be optimized a lot putting the Tokenize into the while check statement, I think, but this is not really required.

This post has been edited by CiccioBastardo: 07 August 2006 - 08:10 PM

[BlueSonicBoy]

CiccioBastardo, on Aug 7 2006, 04:06 PM, said:

I can't understand the continue, instead. Used that way the next line of the string will never be tokenized.
You need:

That looks good to me... But can't we do away with this now?

Quote

try
{
CED2KLink* pLink = CED2KLink::CreateLinkFromUrl(strTok.Trim());
if (pLink)

So we would have:

void CDirectDownloadDlg::OnOK() said:

CString strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
while (!strTok.IsEmpty())
{
strTok.Trim();
if(strTok.IsEmpty()) {
strTok = strLinks.Tokenize(_T("\t\n\r"), curPos);
continue;
}
if (strTok.Right(1) != _T("/"))
strTok += _T("/");
try{
CED2KLink* pLink = CED2KLink::CreateLinkFromUrl(strTok);
if (pLink)
...