search

oe-alliance / AutoBouquetsMaker

Automatically build and update bouquets from the DVB stream.
GNU General Public License v3.0
22 stars 59 forks source link

When "Add provider name to bouquets" is enabled the " - All channels" should be omitted #250

Closed Azureit closed 1 year ago

Azureit commented 1 year ago

When "Add provider name to bouquets" is enabled the " - All channels" should be omitted, it make sense only when the bouquet is a subset of All channels.

AbuBaniaz commented 1 year ago

Although it might makes sense for providers with no sections, it doesn't do so for the ones with sections or the FTA/HD bouquets

As it is now all channels

With the changes all channels azureit

If I hide the sections all channels azureit 2

Azureit commented 1 year ago

It's implicit the provider name alone, without a section, to be the complete provider. And it's clean, specially if we don't have providers sections.

AbuBaniaz commented 1 year ago

As it stands, it does not look right for the providers with sections, FTA, etc.

Are you able to tweak it?

Azureit commented 1 year ago

As it stands, it does not look right for the providers with sections, FTA, etc.

Are you able to tweak it?

Done restricting to when create main bouquet only. Edit2: Tested

AbuBaniaz commented 1 year ago

There is a conflict. Can you please resolve it.

I have tried to resolve it here: https://github.com/AbuBaniaz/AutoBouquetsMaker/tree/10_feb_2023_azure Maybe I have made a mistake, but I don't think it is working as you intended. In any case, it is not adversely affecting Sky UK

abm option1

abm option2

bouquets

Azureit commented 1 year ago

There is a conflict. Can you please resolve it.

I have tried to resolve it here: https://github.com/AbuBaniaz/AutoBouquetsMaker/tree/10_feb_2023_azure Maybe I have made a mistake, but I don't think it is working as you intended. In any case, it is not adversely affecting Sky UK

I think I know whats the problem provider_config.flags is not 1 in sky uk because of the swap channels flag. I will try to fix it.

Azureit commented 1 year ago

@AbuBaniaz If I'm correct, it will fix your issue with sky uk.

AbuBaniaz commented 1 year ago

Sorry about delay in responding. Looks fine to me for UK. Can you post before/after screenshots for the providers without sections, so that we can hopefully satisfy any concerns.

noguxi commented 1 year ago

@AbuBaniaz Because of an encrypted SSD problem, I lost access to my github account and the email I use to register it :-) EDIT: I can't edit this pull request anymore, I hope it can be edited by you if something is missing.

The screenshot you ask. before: img1 after: img2

noguxi commented 1 year ago

@AbuBaniaz Is there anything to fix before commit?

The only way for me to change the code from this pull, is by submitting a new pull with my new github account, and you close this pull from the account I don't have access.

AbuBaniaz commented 1 year ago

@noguxi @Azureit Your comment has disappeared. I don't have a problem with this change. There is no adverse affect for me. Attached are pictures of a setup, still looks fine to me. 1 2

@Huevos @andyblac @skaman @peterfdej @ViX-Sicilian Any objections to merging this?

Huevos commented 1 year ago

I don't understand what the point of this commit is. And the commit text doesn't explain a thing.

Huevos commented 1 year ago

And why are you doing weird things like this: (provider_config.flags & 0xdf) == 1?

Should be: provider_config.isMakeNormalMain()

noguxi commented 1 year ago

And why are you doing weird things like this: (provider_config.flags & 0xdf) == 1?

Should be: provider_config.isMakeNormalMain()

@AbuBaniaz ask me if I could restrict the remove of "- All channels" only when the main bouquet is to be created for a given provider, so I needed to test if ONLY main bouquet will be created, that is different from provider_config.isMakeNormalMain().

Huevos commented 1 year ago

So in providersconfig create a new method. e.g. isMakeOnlyNormalMain.

AbuBaniaz commented 1 year ago

The "all channels" text is pointless for providers with no other sections/bouquets. We don't need an extra option to inhibit the text.

noguxi commented 1 year ago

So in providersconfig create a new method. e.g. isMakeOnlyNormalMain.

@Huevos I had an encrypted SSD problem and lost the email and github account I use to make this pull, so I can't change this pull, so I ask you to make any changes you deem necessary. If you don't have the time I can make a new pull request from this new github account and we close this pull request.

Huevos commented 1 year ago

The "all channels" text is pointless for providers with no other sections/bouquets. We don't need an extra option to inhibit the text.

You obviously have no clue what I am about.

AbuBaniaz commented 1 year ago

You obviously have no clue what I am about.

Let's agree to disagree about that. All the best to you and your family.

AbuBaniaz commented 1 year ago

@noguxi If you want to resubmit it with the requested changes, please do so from your new account.

Huevos commented 1 year ago

This PR is not even against the current version of the repo.

noguxi commented 1 year ago

@noguxi If you want to resubmit it with the requested changes, please do so from your new account.

Yes I will do it.

This PR is not even against the current version of the repo.

I will do a new PR and simplify the code.

EDIT: @Huevos you already commit a PR. I had some simplifications of this PR.