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

fix python 3.x script execution windows support #8

Merged
merged 3 commits into from
Sep 15, 2023

Conversation

ureyNZB
Copy link
Contributor

@ureyNZB ureyNZB commented Aug 3, 2023

python 3.x has %L (unprocessable) in command string format windows registry key instead of %1(processable) in 2.x python. So we can just check and replace.

python 3.x has %L (unprocessable) in command string format windows registry key instead of %1(processable) in 2.x python. So we can just check and replace.
@ureyNZB ureyNZB merged commit f25a87c into develop Sep 15, 2023
2 checks passed
@ureyNZB ureyNZB mentioned this pull request Sep 21, 2023
ureyNZB added a commit that referenced this pull request Sep 21, 2023
* updated version string to "21.2-testing"

* #784: removed expired root certificate

 from ca root certificate store: certificate “DST Root CA X3” used by
Lets Encrypt

* daemon:connect: don't use FIPS_mode_set with OpenSSL 3 (#3)

This function has been removed in OpenSSL 3, replaced by
EVP_default_properties_enable_fips. See
https://www.openssl.org/docs/man3.0/man7/migration_guide.html

Co-authored-by: ureyNZB <urey.by@gmail.com>

* Feature windows build fix (#9)

* fix build for windows

code fixes and add regex lib files to project

* vcxproj for all platforms build

#define ZLIB_WINAPI commented due to win32 zlib linking error

* move regex to lib directory

* Add windows build workflow (#11)

* Test windows runner

* Add build-nzbget-vs22.bat. Update nzbget.vcxproj.

* Add build stage on runner

* Add upload artifacts

* Update success exit code

* Update hardcoded windows resource directory

* Update include and lib file paths

* Add version detect from nzbget.vcxproj

* Update branches for build

---------

Co-authored-by: phnzb <139914799+phnzb@users.noreply.github.com>

* Add linux build workflow. Update linux version. Modify rules for build workflows (#12)

* Add linux build workflow

* Update linux version to 22.0

* Update build workflows

* Return back LARGE_OFF_T definition

* Update workflow rules and linux build command

* update version fixes (#19)

UI and web links fixes

Co-authored-by: ureyNZB <yuriy@nzbget.com>

* Changed the progress-block class to use a calculated width of 8.5rem (#17)

Original PR link: nzbget/nzbget#724
Author: @acidDrain

Changed

progress-block class in webui/styles.css

What Changed

Set the width property to a calculate 8.5rem instead of fixed 120px.

/******************

    webui/style.css *
    *****************/
    1117 / BEGIN: Progress bars */
    1118 .progress-block {
    1119 position: relative;

    1120 width: 120px;

    1120 width: calc(8.5rem);
    1121 }
    1122
    1123 .progress {
    1124 margin-bottom: 0px;
    1125 background: #f0f0f0;

Why

Progressbar text in the Downloads view becomes unreadable; text is crammed and overlapping for large files (e.g. 18.42GB)
Validation

I tested using:

Mozilla Firefox 83 (x86_64) - default font settings: 16px

lsb_release -a output

$ lsb_release -a
Distributor ID: Debian
Description: Debian GNU/Linux 10 (buster)
Release: 10
Codename: buster

uname output

$ uname -a | awk '{ for (i=1; i<= NF; i++) if ($i != $2) printf("%s ", $i); print "\n"}'
Linux 5.8.0-0.bpo.2-amd64 #1 SMP Debian 5.8.10-1~bpo10+1 (2020-09-26) x86_64 GNU/Linux

native resolution 3440x1440
Web Developer Tools to simulate mobile (iPhone 8) device in portrait and landscape mode
xrandr --query output

$ xrandr --query
DP-1 connected primary 3440x1440+0+0 (normal left inverted right x axis y axis) 800mm x 335mm

xrdb -query output

$ xrdb -query
Xft.antialias: true
Xft.

autohint: true
Xft.dpi: 120
Xft.hinting: true
Xft.hintstyle: hintslight
Xft.lcdfilter: lcddefault
Xft.rgba: rgba

I did not observe any adverse effects on the surrounding elements or the overall layout.

* Download time with empty minutes and seconds (#16)

orig PR: nzbget/nzbget#800

Calculation of
Total time
Download time
Verification time
Repair time
Unpack time
was broken for python3. Everything except hours

def format_time_sec_orig(sec):
Hour = sec / 3600
Min = (sec - (sec / 3600) * 3600) / 60
Sec = (sec - (sec / 3600) * 3600) % 60
return '%d:%02d:%02d' % (Hour, Min, Sec)

def format_time_sec_new(sec):
Hour = sec / 3600
Min = (sec % 3600) / 60
Sec = (sec % 60)
return '%d:%02d:%02d' % (Hour, Min, Sec)

print("Orig: " + format_time_sec_orig(int(7199)))
print("New: " + format_time_sec_new(int(7199)))

Output:

1:00:00
1:59:59

Process finished with exit code 0

* add version key to windows registry (#14)

* change nzbget.net to nzbget.com (#13)

* fix according to discription (#10)

issue nzbget/nzbget#693. need testing

* fix python 3.x script execution windows support (#8)

* fix python 3.x script execution windows support

python 3.x has %L (unprocessable) in command string format windows registry key instead of %1(processable) in 2.x python. So we can just check and replace.

* fix for Debug configuration

* Update pubkey.pem. Update windows build script to include pubkey.pem. (#20)

* Change CI/CD to target main branch on release build (#22)

* change nzbget.net to nzbget.com part 2 (#21)

* change nzbget.net to nzbget.com part 2

fix missing changes nzbget.net to nzbget.com

* Updating site links

---------

Co-authored-by: alexabenti <alex@nzbget.com>

* update changelog (#24)

* update changelog

* update changelog

---------

Co-authored-by: Andrey Prygunkov <hugbug@users.sourceforge.net>
Co-authored-by: ureyNZB <urey.by@gmail.com>
Co-authored-by: phnzb <139914799+phnzb@users.noreply.github.com>
Co-authored-by: alexabenti <alex@nzbget.com>
@phnzb phnzb deleted the feature-python3-scripts-win branch October 20, 2023 08:37
PrivatePuffin referenced this pull request in truecharts/public Jan 9, 2024
…22.0@d6b3b69 by renovate (#17026)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ghcr.io/geek-cookbook/nzbget](https://togithub.com/nzbgetcom/nzbget)
| major | `21.1` -> `22.0` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>nzbgetcom/nzbget (ghcr.io/geek-cookbook/nzbget)</summary>

### [`v22.0`](https://togithub.com/nzbgetcom/nzbget/releases/tag/v22.0)

[Compare
Source](https://togithub.com/nzbgetcom/nzbget/compare/v21.1...v22.0)

#### What's Changed

- daemon:connect: don't use FIPS_mode_set with OpenSSL 3 by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/3](https://togithub.com/nzbgetcom/nzbget/pull/3)
- Feature windows build fix by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/9](https://togithub.com/nzbgetcom/nzbget/pull/9)
- Add linux build workflow. Update linux version. Modify rules for build
workflows by [@&#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/12](https://togithub.com/nzbgetcom/nzbget/pull/12)
- UI and web links fixes, temporary disable testing/develop update
channels by [@&#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/19](https://togithub.com/nzbgetcom/nzbget/pull/19)
- Changed the progress-block class to use a calculated width of 8.5rem
by [@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/17](https://togithub.com/nzbgetcom/nzbget/pull/17)
- Download time with empty minutes and seconds by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/16](https://togithub.com/nzbgetcom/nzbget/pull/16)
- add version key to windows registry by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/14](https://togithub.com/nzbgetcom/nzbget/pull/14)
- change nzbget.net to nzbget.com by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/13](https://togithub.com/nzbgetcom/nzbget/pull/13)
- fix according to discription by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/10](https://togithub.com/nzbgetcom/nzbget/pull/10)
- fix python 3.x script execution windows support by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/8](https://togithub.com/nzbgetcom/nzbget/pull/8)
- Update pubkey.pem. Update windows build script to include pubkey.pem.
by [@&#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/20](https://togithub.com/nzbgetcom/nzbget/pull/20)
- Change master ->main in workflows by
[@&#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/22](https://togithub.com/nzbgetcom/nzbget/pull/22)
- change nzbget.net to nzbget.com part 2 by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/21](https://togithub.com/nzbgetcom/nzbget/pull/21)
- update changelog by [@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/24](https://togithub.com/nzbgetcom/nzbget/pull/24)
- nsi script fix for windows 11 by
[@&#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/26](https://togithub.com/nzbgetcom/nzbget/pull/26)
- readme expansion by [@&#8203;luckedea](https://togithub.com/luckedea)
in
[https://github.com/nzbgetcom/nzbget/pull/30](https://togithub.com/nzbgetcom/nzbget/pull/30)
- README.md: added project/repository status badges by
[@&#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/31](https://togithub.com/nzbgetcom/nzbget/pull/31)
- Add pull requests flow to README by
[@&#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/32](https://togithub.com/nzbgetcom/nzbget/pull/32)
- feature/macos build by [@&#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/33](https://togithub.com/nzbgetcom/nzbget/pull/33)
- add: macos build status badge by
[@&#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/35](https://togithub.com/nzbgetcom/nzbget/pull/35)
- Release v22.0 by [@&#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/36](https://togithub.com/nzbgetcom/nzbget/pull/36)

#### New Contributors

- [@&#8203;ureyNZB](https://togithub.com/ureyNZB) made their first
contribution in
[https://github.com/nzbgetcom/nzbget/pull/3](https://togithub.com/nzbgetcom/nzbget/pull/3)
- [@&#8203;dnzbk](https://togithub.com/dnzbk) made their first
contribution in
[https://github.com/nzbgetcom/nzbget/pull/27](https://togithub.com/nzbgetcom/nzbget/pull/27)
- [@&#8203;luckedea](https://togithub.com/luckedea) made their first
contribution in
[https://github.com/nzbgetcom/nzbget/pull/30](https://togithub.com/nzbgetcom/nzbget/pull/30)

**Full Changelog**:
nzbgetcom/nzbget@v21.1...v22.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone
Europe/Amsterdam, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjYuMiIsInVwZGF0ZWRJblZlciI6IjM3LjEyNi4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
GabrielBarzen referenced this pull request in GabrielBarzen/charts Feb 2, 2024
…22.0@d6b3b69 by renovate (truecharts#17026)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ghcr.io/geek-cookbook/nzbget](https://togithub.com/nzbgetcom/nzbget)
| major | `21.1` -> `22.0` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>nzbgetcom/nzbget (ghcr.io/geek-cookbook/nzbget)</summary>

### [`v22.0`](https://togithub.com/nzbgetcom/nzbget/releases/tag/v22.0)

[Compare
Source](https://togithub.com/nzbgetcom/nzbget/compare/v21.1...v22.0)

#### What's Changed

- daemon:connect: don't use FIPS_mode_set with OpenSSL 3 by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/3](https://togithub.com/nzbgetcom/nzbget/pull/3)
- Feature windows build fix by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/9](https://togithub.com/nzbgetcom/nzbget/pull/9)
- Add linux build workflow. Update linux version. Modify rules for build
workflows by [@&truecharts#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/12](https://togithub.com/nzbgetcom/nzbget/pull/12)
- UI and web links fixes, temporary disable testing/develop update
channels by [@&truecharts#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/19](https://togithub.com/nzbgetcom/nzbget/pull/19)
- Changed the progress-block class to use a calculated width of 8.5rem
by [@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/17](https://togithub.com/nzbgetcom/nzbget/pull/17)
- Download time with empty minutes and seconds by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/16](https://togithub.com/nzbgetcom/nzbget/pull/16)
- add version key to windows registry by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/14](https://togithub.com/nzbgetcom/nzbget/pull/14)
- change nzbget.net to nzbget.com by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/13](https://togithub.com/nzbgetcom/nzbget/pull/13)
- fix according to discription by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/10](https://togithub.com/nzbgetcom/nzbget/pull/10)
- fix python 3.x script execution windows support by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/8](https://togithub.com/nzbgetcom/nzbget/pull/8)
- Update pubkey.pem. Update windows build script to include pubkey.pem.
by [@&truecharts#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/20](https://togithub.com/nzbgetcom/nzbget/pull/20)
- Change master ->main in workflows by
[@&truecharts#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/22](https://togithub.com/nzbgetcom/nzbget/pull/22)
- change nzbget.net to nzbget.com part 2 by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/21](https://togithub.com/nzbgetcom/nzbget/pull/21)
- update changelog by [@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/24](https://togithub.com/nzbgetcom/nzbget/pull/24)
- nsi script fix for windows 11 by
[@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) in
[https://github.com/nzbgetcom/nzbget/pull/26](https://togithub.com/nzbgetcom/nzbget/pull/26)
- readme expansion by [@&truecharts#8203;luckedea](https://togithub.com/luckedea)
in
[https://github.com/nzbgetcom/nzbget/pull/30](https://togithub.com/nzbgetcom/nzbget/pull/30)
- README.md: added project/repository status badges by
[@&truecharts#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/31](https://togithub.com/nzbgetcom/nzbget/pull/31)
- Add pull requests flow to README by
[@&truecharts#8203;phnzb](https://togithub.com/phnzb) in
[https://github.com/nzbgetcom/nzbget/pull/32](https://togithub.com/nzbgetcom/nzbget/pull/32)
- feature/macos build by [@&truecharts#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/33](https://togithub.com/nzbgetcom/nzbget/pull/33)
- add: macos build status badge by
[@&truecharts#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/35](https://togithub.com/nzbgetcom/nzbget/pull/35)
- Release v22.0 by [@&truecharts#8203;dnzbk](https://togithub.com/dnzbk) in
[https://github.com/nzbgetcom/nzbget/pull/36](https://togithub.com/nzbgetcom/nzbget/pull/36)

#### New Contributors

- [@&truecharts#8203;ureyNZB](https://togithub.com/ureyNZB) made their first
contribution in
[https://github.com/nzbgetcom/nzbget/pull/3](https://togithub.com/nzbgetcom/nzbget/pull/3)
- [@&truecharts#8203;dnzbk](https://togithub.com/dnzbk) made their first
contribution in
[https://github.com/nzbgetcom/nzbget/pull/27](https://togithub.com/nzbgetcom/nzbget/pull/27)
- [@&truecharts#8203;luckedea](https://togithub.com/luckedea) made their first
contribution in
[https://github.com/nzbgetcom/nzbget/pull/30](https://togithub.com/nzbgetcom/nzbget/pull/30)

**Full Changelog**:
nzbgetcom/nzbget@v21.1...v22.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone
Europe/Amsterdam, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjYuMiIsInVwZGF0ZWRJblZlciI6IjM3LjEyNi4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
@dnzbk dnzbk mentioned this pull request Mar 11, 2024
1 task
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.

2 participants