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.

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

Make message less misleading, closes #42 #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/zsclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ namespace zsync2 {

// check whether file exists at all, because if not, a full download is required
if (!isfile(pathToLocalFile)) {
issueStatusMessage("Cannot find file " + pathToLocalFile + ", triggering full download");
issueStatusMessage("Cannot find file " + pathToLocalFile);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's more misleading than before. I already explained what the message means. Now it's more than ambiguous...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not "triggering a full download" if further down below there is a file supplied with -i.

Copy link
Member

@TheAssassin TheAssassin Aug 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True. But what's the file and why does it look for it at all? This is not an error, not even a warning. However now it looks like a serious problem.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the message altogether?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not state that this filename has been taken from the .zsync file, but we couldn't find it?

Copy link
Member

@TheAssassin TheAssassin Aug 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That also doesn't tell "why" it's looking for that file. Please add some comment with regards to this. Otherwise it's quite good.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping file (...) suggested by (...).zsync because it is not found locally at (...)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess .zsync file is sufficient. Not sure what the at part is for. The message doesn't tell what it wants to use the file for. It's like an implicit -i, isn't it?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about just mentioning the file if it could be found? Something like "Found file ... suggested by .zsync file locally, trying to use data from it"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

updateAvailable = true;
return true;
}
Expand Down