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

Proxy settings fixes #285

Merged
merged 2 commits into from
May 31, 2021
Merged

Conversation

galeksandrp
Copy link
Contributor

@galeksandrp galeksandrp commented May 16, 2021

  • Fixes Proxy from Elementum settings setting

Log reported setting applied without really doing anything.

  • Adds Proxy from Elementum (resolve hosts by proxy) setting option

Option enables default behaviour of Elementum in Burst. Option is set as new default,
existing users should not be affected by change.

  • Adds choice of additional proxy protocols in settings

SOCKS4a (SOCKS4 latest version with hostname resolve by proxy)
SOCKS5h (SOCKS5 latest version with hostname resolve by proxy). Protocol is set as new
default to match default setting in Elementum, existing users should not be affected by
change.

  • Adds help label for use_elementum_proxy setting

@galeksandrp galeksandrp force-pushed the socks-hostname-resolve branch 4 times, most recently from 8985378 to 090b8d1 Compare May 16, 2021 21:01
@galeksandrp galeksandrp reopened this May 16, 2021
@galeksandrp galeksandrp force-pushed the socks-hostname-resolve branch 4 times, most recently from bd39dcf to c236c63 Compare May 16, 2021 21:41
@elgatito
Copy link
Owner

@galeksandrp Was that testes with Kodi 17/18?

@galeksandrp galeksandrp force-pushed the socks-hostname-resolve branch from c236c63 to 04aaf27 Compare May 22, 2021 07:55
@galeksandrp
Copy link
Contributor Author

galeksandrp commented May 22, 2021

Version Operating System Result
Kodi 17.6 Git:20171114-a9a7a20 Windows 10 2004 ALL OK
✅Proxying Burst via Elementum
✅Using proxy settings from Elementum
✅Proxy settings from Elementum and hosts resolve by proxy
✅Using SOCKS5h proxy in Burst
✅Using SOCKS4a proxy in Burst
✅Using SOCKS5 proxy in Burst
✅Using SOCKS4 proxy in Burst
Kodi 18.9 (18.9.0) Git:20201023-0655c2c718 Windows 10 2004 ALL OK
✅Proxying Burst via Elementum
✅Using proxy settings from Elementum
✅Proxy settings from Elementum and hosts resolve by proxy
✅Using SOCKS5h proxy in Burst
✅Using SOCKS4a proxy in Burst
✅Using SOCKS5 proxy in Burst
✅Using SOCKS4 proxy in Burst
Kodi 19.1 (19.1.0) Git:20210508-85e05228b4 Windows 10 2004 ALL OK
✅Proxying Burst via Elementum
✅Using proxy settings from Elementum
✅Proxy settings from Elementum and hosts resolve by proxy
✅Using SOCKS5h proxy in Burst
✅Using SOCKS4a proxy in Burst
✅Using SOCKS5 proxy in Burst
✅Using SOCKS4 proxy in Burst

@@ -244,7 +244,7 @@ msgid "Use proxy settings"
msgstr ""

msgctxt "#32107"
msgid "Proxy from Elementum settings"
msgid "From Elementum settings"
Copy link
Contributor

Choose a reason for hiding this comment

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

@galeksandrp
since you changed template - you also need to change all translated files, otherwise the will lose old translation after running synchronization scripts in scripts dir.

for file in resources/language/*/*.po; do sed -i 's/msgid "Proxy from Elementum settings"/msgid "From Elementum settings"/' "$file"; done
will do the trick.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, thanks!

@elgatito
Copy link
Owner

@galeksandrp please, run

./scripts/xgettext.sh
./scripts/xgettext_merge.sh

Is this finished? Working as expected?

@elgatito
Copy link
Owner

@galeksandrp ping

- Fixes `Proxy from Elementum settings` setting

Log reported setting applied without really doing anything.

- Adds `Proxy from Elementum (resolve hosts by proxy)` setting option

Option enables default behaviour of `Elementum` in `Burst`. Option is set as new default,
existing users should not be affected by change.

- Adds choice of additional proxy protocols in settings

`SOCKS4a` (`SOCKS4` latest version with hostname resolve by proxy)
`SOCKS5h` (`SOCKS5` latest version with hostname resolve by proxy). Protocol is set as new
default to match default setting in `Elementum`, existing users should not be affected by
change.

- Adds help label for `use_elementum_proxy` setting
@galeksandrp galeksandrp force-pushed the socks-hostname-resolve branch from 79508f8 to 74f4722 Compare May 30, 2021 10:14
1. ./scripts/xgettext.sh EXIT CODE 0
2. ./scripts/xgettext_merge.sh EXIT CODE 0
@galeksandrp
Copy link
Contributor Author

galeksandrp commented May 30, 2021

./scripts/xgettext.sh ALL OK
[galek@HP2 script.elementum.burst]$ ./scripts/xgettext.sh 
Checking resources/language/Croatian/strings.po                        [  OK  ]
Checking resources/language/English/strings.po                         [  OK  ]
Checking resources/language/French/strings.po                          [  OK  ]
Checking resources/language/German/strings.po                          [  OK  ]
Checking resources/language/Hebrew/strings.po                          [  OK  ]
Checking resources/language/Hungarian/strings.po                       [  OK  ]
Checking resources/language/Italian/strings.po                         [  OK  ]
Checking resources/language/Lithuania/strings.po                       [  OK  ]
Checking resources/language/Portuguese (Brazil)/strings.po             [  OK  ]
Checking resources/language/Portuguese/strings.po                      [  OK  ]
Checking resources/language/Russian/strings.po                         [  OK  ]
Checking resources/language/Spanish (Argentina)/strings.po             [  OK  ]
Checking resources/language/Spanish (Mexico)/strings.po                [  OK  ]
Checking resources/language/Spanish/strings.po                         [  OK  ]
Checking resources/language/Swedish/strings.po                         [  OK  ]
Checking resources/language/Ukrainian/strings.po                       [  OK  ]
[galek@HP2 script.elementum.burst]$ echo $?
0
[galek@HP2 script.elementum.burst]$ git status
On branch socks-hostname-resolve
Your branch is up to date with 'origin/socks-hostname-resolve'.

nothing to commit, working tree clean
./scripts/xgettext_merge.sh ALL OK
[galek@HP2 script.elementum.burst]$ ./scripts/xgettext_merge.sh
Merging resources/language/Croatian/strings.po                          
[  OK  ]

Merging resources/language/English/strings.po                           
[  OK  ]

Merging resources/language/French/strings.po                            
[  OK  ]

Merging resources/language/German/strings.po                            
[  OK  ]

Merging resources/language/Hebrew/strings.po                            
[  OK  ]

Merging resources/language/Hungarian/strings.po                         
[  OK  ]

Merging resources/language/Italian/strings.po                           
[  OK  ]

Merging resources/language/Lithuania/strings.po                         
[  OK  ]

Merging resources/language/Portuguese (Brazil)/strings.po               
[  OK  ]

Merging resources/language/Portuguese/strings.po                        
[  OK  ]

Merging resources/language/Russian/strings.po                           
[  OK  ]

Merging resources/language/Spanish (Argentina)/strings.po               
[  OK  ]

Merging resources/language/Spanish (Mexico)/strings.po                  
[  OK  ]

Merging resources/language/Spanish/strings.po                           
[  OK  ]

Merging resources/language/Swedish/strings.po                           
[  OK  ]

Merging resources/language/Ukrainian/strings.po                         
[  OK  ]

[galek@HP2 script.elementum.burst]$ echo $?
0
[galek@HP2 script.elementum.burst]$ git status
On branch socks-hostname-resolve
Your branch is up to date with 'origin/socks-hostname-resolve'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   resources/language/Croatian/strings.po
        modified:   resources/language/French/strings.po
        modified:   resources/language/German/strings.po
        modified:   resources/language/Hebrew/strings.po
        modified:   resources/language/Hungarian/strings.po
        modified:   resources/language/Italian/strings.po
        modified:   resources/language/Lithuania/strings.po
        modified:   resources/language/Portuguese (Brazil)/strings.po
        modified:   resources/language/Portuguese/strings.po
        modified:   resources/language/Russian/strings.po
        modified:   resources/language/Spanish (Argentina)/strings.po
        modified:   resources/language/Spanish (Mexico)/strings.po
        modified:   resources/language/Spanish/strings.po
        modified:   resources/language/Swedish/strings.po
        modified:   resources/language/Ukrainian/strings.po

no changes added to commit (use "git add" and/or "git commit -a")

I am committed files changed by ./scripts/xgettext_merge.sh into separate commit, you can merge PR with squash.

Technically I should redo manual testing from #285 (comment), but I can't do that earlier than 2020-06-05. Well, we can hope that xgettext not destroyed anything.

@elgatito elgatito merged commit 4bc85e9 into elgatito:master May 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants