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

lib/model: Consistently show folder description in startup messages #3825

Closed
wants to merge 2 commits into from
Closed

lib/model: Consistently show folder description in startup messages #3825

wants to merge 2 commits into from

Conversation

calmh
Copy link
Member

@calmh calmh commented Dec 19, 2016

We missed a couple of places to show the folder description (id + label) instead of just the ID.

Since we anyway need the folderConfig for this I'm skipping the copying of all it's attributes that rwfolder did and just keeping the original around instead.

Since we anyway need the folderConfig for this I'm skipping the copying
of all it's attributes that rwfolder did and just keeping the original
around instead.
@@ -20,6 +20,7 @@ func init() {

type sendOnlyFolder struct {
folder
cfg config.FolderConfiguration
}
Copy link
Member

Choose a reason for hiding this comment

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

You could embed both, and drop the .cfg. everywhere.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, that'd be cleaner. And fix the tests. I'll get to it.

@@ -20,7 +20,7 @@ func init() {

type sendOnlyFolder struct {
folder
cfg config.FolderConfiguration
config.FolderConfiguration
}
Copy link
Member

Choose a reason for hiding this comment

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

There was a joke about how Latvian president asked Lithuanian president to lend them tanks when Russian invaded Latvia.

The Lithuanian president asked whether the Latvian president would like one of them, or all of them... while Lithuania only had two...

TL;DR:
Given all of our two folders are embedding folder, I suggest we embed config in folder instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

I have a funny joke about where exactly you can embed your config...

:trollface: anyway, that folder thing is a bit of a weird appending as it has almost no functionality. Should sort that out same day.

@AudriusButkevicius
Copy link
Member

Fine.

@AudriusButkevicius
Copy link
Member

@st-review merge

@st-review
Copy link

👌 Merged as 5c06766. Thanks, @calmh!

@st-review st-review closed this Dec 21, 2016
st-review pushed a commit that referenced this pull request Dec 21, 2016
Since we anyway need the folderConfig for this I'm skipping the copying
of all it's attributes that rwfolder did and just keeping the original
around instead.

GitHub-Pull-Request: #3825
@calmh calmh deleted the folderdescr branch December 21, 2016 18:44
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Dec 22, 2017
@syncthing syncthing locked and limited conversation to collaborators Dec 22, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants