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

Feature/owm sh stargieg old api #185

Merged
merged 5 commits into from
Jul 16, 2021
Merged

Conversation

akira25
Copy link
Member

@akira25 akira25 commented Jun 17, 2021

Description:
This should fix #159 for a short while. further improvements on this can be taken, when the discussion in freifunk/openwifimap-api#13 is finished.

@akira25 akira25 force-pushed the feature/owm_sh_stargieg_old_api branch from c9977ea to 56c2f15 Compare June 20, 2021 10:28
@akira25
Copy link
Member Author

akira25 commented Jun 20, 2021

I had no answer from @stargieg until now. I added the signature to satisfy the f****ing CI and get that hopefully merged soon. Hope that's okay for you, @stargieg. As I refactored that code pretty much, git would blame me anyway.

@akira25 akira25 force-pushed the feature/owm_sh_stargieg_old_api branch 2 times, most recently from bbf13bd to 8225488 Compare June 30, 2021 21:24
@akira25 akira25 requested review from pmelange and spolack June 30, 2021 21:30
@akira25 akira25 force-pushed the feature/owm_sh_stargieg_old_api branch from 8225488 to d116a5b Compare July 1, 2021 21:39
json_add_string sourceAddr4 "$1"
json_add_string destAddr4 "$2"
json_add_string id "$3"
#json_add_string quality "$4"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why?

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'ts a relict from the development process. I removed it.

if [ -n "$phone" ]; then json_add_string phone "$phone"; fi
if [ -n "$homepage" ]; then json_add_string homepage "$homepage"; fi #ToDo: list of homepages
if [ -n "$note" ]; then json_add_string note "$note"; fi
# ToDo: add location-string
Copy link
Contributor

Choose a reason for hiding this comment

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

You did not add the location string?

Copy link
Member Author

Choose a reason for hiding this comment

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

In fact the location string was never sent to owm. So I removed it too. Was just like a deprecated reminder to myself.

@akira25 akira25 force-pushed the feature/owm_sh_stargieg_old_api branch from d116a5b to 5bbb299 Compare July 5, 2021 19:45
@PolynomialDivision
Copy link
Contributor

Thanks for putting all your effort into this project! :) But couldn't we rename this project to something else? It hast nothing to do with luci?

@akira25
Copy link
Member Author

akira25 commented Jul 6, 2021

Thanks for putting all your effort into this project! :) But couldn't we rename this project to something else? It hast nothing to do with luci?

Was the question on luci really a question or an statement?

It has to do with luci. The package provides a luci-app for something. Even if we decide to remove that luci-stuff, that should definitely go into another PR, as this definitely wouldn't relate to #159.

Please don't start nitpicking. :-)

@akira25
Copy link
Member Author

akira25 commented Jul 10, 2021

@PolynomialDivision
Is there anything besides complete restucture, that prevents this from being merged? :)

@pmelange
Copy link
Collaborator

This needs a migration script for those who upgrade the firmware. The migration script needs to change the cronjob.

I did not take a complete look at the script. More to come later....

As OpenWrt will stop its use of lua in the next time, we decided
to reimplement the owm.lua script, which pushes node data to the
openwifimap api. This script implements some kind of owm-api v1.0.

It's a basis for the new owm-api-script, which we can write, after
we found a definition for the new format.

Signed-off-by: Martin Hübner <[email protected]>
@akira25 akira25 force-pushed the feature/owm_sh_stargieg_old_api branch from 5bbb299 to c7bd274 Compare July 11, 2021 15:47
@PolynomialDivision
Copy link
Contributor

Am I allowed to package that and put that into openwrt/packages ? I would also add procd support. I really don't understand the reason for doing this as luci-app? We currently do not use any luci component from it?

@akira25
Copy link
Member Author

akira25 commented Jul 11, 2021

Am I allowed to package that and put that into openwrt/packages ? I would also add procd support. I really don't understand the reason for doing this as luci-app? We currently do not use any luci component from it?

There is some antenna stuff in this app too. As I currently don't fully understand the impact of that antenna-stuff, I'd really like postpone that issue into a later PR.

In concern of OpenWrt: Why should this get part of OpenWrt? It's obviously Freifunk Berlin specific software. In addition this script will change in near feature. I don't want to discuss with the OpenWrt-Devs, that propably don't know our needs.
If we have to much people involved into this, we won't see any advancement anymore...

@PolynomialDivision
Copy link
Contributor

In concern of OpenWrt: Why should this get part of OpenWrt? It's obviously Freifunk Berlin specific software.

It is a owm project. This can be used for arbitrary projects. In addition, I would re-name config files to owm or openwifimap.

I would say if we hold it generic, all people ca benefit from it. Maybe other people also want to do similar things.

@pmelange
Copy link
Collaborator

I think it would be better to get the Falter specific version merged first and then to think about how to generalize later.

@akira25
Copy link
Member Author

akira25 commented Jul 15, 2021

I agree. Could someone hit that merge button then please?

@pmelange pmelange merged commit a121188 into master Jul 16, 2021
@pmelange
Copy link
Collaborator

Should this be cherry-picked into 2102? 1907?

@akira25
Copy link
Member Author

akira25 commented Jul 16, 2021

Should this be cherry-picked into 2102? 1907?

It should be cherry-picked to 21.02 only.

@akira25 akira25 deleted the feature/owm_sh_stargieg_old_api branch August 8, 2021 09:57
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.

RFC: Replacement of owm.lua
4 participants