launcher: allow overriding service url and url slash from the command line - [merged] #172

Closed
opened 2020-12-21 10:46:51 +03:00 by icex2 · 12 comments
icex2 commented 2020-12-21 10:46:51 +03:00 (Migrated from github.com)

In GitLab by @xyen on Dec 21, 2020, 08:46

Merges ea3_override -> master

This change allows users to override the service URL and slash from the command line, so that they don't need to touch ea3-config.xml in some scenarios.

Also fixes a mistake where the jbhook was using the wrong type enum (resulting in an incorrect comment).

This addresses #63

In GitLab by @xyen on Dec 21, 2020, 08:46 _Merges ea3_override -> master_ This change allows users to override the service URL and slash from the command line, so that they don't need to touch ea3-config.xml in some scenarios. Also fixes a mistake where the jbhook was using the wrong type enum (resulting in an incorrect comment). This addresses #63
icex2 commented 2020-12-21 14:17:16 +03:00 (Migrated from github.com)

Duplicate? Isn’t override_urlslash and override_urlslash_enable doing the same?

Duplicate? Isn’t override_urlslash and override_urlslash_enable doing the same?
icex2 commented 2020-12-21 14:17:16 +03:00 (Migrated from github.com)

You can reduce the number of options by using a NULL check on the string to check if override is enabled.

You can reduce the number of options by using a NULL check on the string to check if override is enabled.
icex2 commented 2020-12-21 14:17:16 +03:00 (Migrated from github.com)

Not: Would call these ea3_ident_set_property_xxx as they not just replace existing nodes but set non existing ones

Not: Would call these ea3_ident_set_property_xxx as they not just replace existing nodes but set non existing ones
icex2 commented 2020-12-21 20:53:44 +03:00 (Migrated from github.com)

In GitLab by @xyen on Dec 21, 2020, 18:53

Commented on src/main/launcher/options.h line 23

No, because override_urlslash_enable sets the value to override_urlslash which is either true, or false, and the value inside of the original ea3-config could be either.

In GitLab by @xyen on Dec 21, 2020, 18:53 Commented on [src/main/launcher/options.h line 23](https://github.com/djhackersdev/bemanitools/compare/13977269ec0066345607f4c0453287f12b51695f..cb5206a86b0a9989955ea72b19fe7bc842f47a48#diff-7f7b97f24893ce337e1ebf2071155f8eR23) No, because `override_urlslash_enable` sets the value to `override_urlslash` which is either true, or false, and the value inside of the original ea3-config could be either.
icex2 commented 2020-12-21 20:53:44 +03:00 (Migrated from github.com)

In GitLab by @xyen on Dec 21, 2020, 18:53

Commented on src/main/launcher/ea3-config.h line 41

True, I suppose, but their usage in this code is only for replacing existing nodes.

In GitLab by @xyen on Dec 21, 2020, 18:53 Commented on [src/main/launcher/ea3-config.h line 41](https://github.com/djhackersdev/bemanitools/compare/13977269ec0066345607f4c0453287f12b51695f..cb5206a86b0a9989955ea72b19fe7bc842f47a48#diff-752e4519c0802fd7d1ffacb42380e601R41) True, I suppose, but their usage in this code is only for replacing existing nodes.
icex2 commented 2020-12-21 20:59:53 +03:00 (Migrated from github.com)

Still, different expactation of function naming compared to its implementation. Nothing severe, so I can let it pass.

Still, different expactation of function naming compared to its implementation. Nothing severe, so I can let it pass.
icex2 commented 2020-12-21 20:59:55 +03:00 (Migrated from github.com)

resolved all threads

resolved all threads
icex2 commented 2020-12-21 21:02:17 +03:00 (Migrated from github.com)

For consistency, I'd rather leave it explicit.

What consistency are you referring to? I don't see another case in launcher that is doing something similar.

> For consistency, I'd rather leave it explicit. What consistency are you referring to? I don't see another case in launcher that is doing something similar.
icex2 commented 2020-12-21 21:04:39 +03:00 (Migrated from github.com)

In GitLab by @xyen on Dec 21, 2020, 19:04

Commented on src/main/launcher/options.c line 144

changed this line in version 2 of the diff

In GitLab by @xyen on Dec 21, 2020, 19:04 Commented on [src/main/launcher/options.c line 144](https://github.com/djhackersdev/bemanitools/compare/e49b1e05c1116855e5ec326b976226150b70e6b8..1e6e80c386f72ffb435993b682ec3f043006abab#diff-4e5da459d0743a74c9ae895610118c23R144) changed this line in [version 2 of the diff](/djhackers/bemanitools/-/merge_requests/71/diffs?diff_id=1398&start_sha=1e6e80c386f72ffb435993b682ec3f043006abab#cb0d472147e51f96b165639897cef39038e46a27_144_148)
icex2 commented 2020-12-21 21:04:39 +03:00 (Migrated from github.com)

In GitLab by @xyen on Dec 21, 2020, 19:04

added 7 commits

  • 1e6e80c3...13977269 - 5 commits from branch master
  • 52d73555 - launcher: allow overriding service url and url slash from the command line
  • cb5206a8 - launcher: Actually init the default service override options and make...

Compare with previous version

In GitLab by @xyen on Dec 21, 2020, 19:04 added 7 commits <ul><li>1e6e80c3...13977269 - 5 commits from branch <code>master</code></li><li>52d73555 - launcher: allow overriding service url and url slash from the command line</li><li>cb5206a8 - launcher: Actually init the default service override options and make...</li></ul> [Compare with previous version](/djhackers/bemanitools/-/merge_requests/71/diffs?diff_id=1398&start_sha=1e6e80c386f72ffb435993b682ec3f043006abab)
icex2 commented 2020-12-21 21:05:07 +03:00 (Migrated from github.com)

In GitLab by @xyen on Dec 21, 2020, 19:05

resolved all threads

In GitLab by @xyen on Dec 21, 2020, 19:05 resolved all threads
icex2 commented 2020-12-21 21:16:23 +03:00 (Migrated from github.com)

approved this merge request

approved this merge request
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Max/djhackersdev_bemanitools#172