From dbdf9d63af31770ad57302e16b17a2fdc526773f Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Fri, 8 Jul 2022 12:36:33 +0200 Subject: [PATCH] rename gps303 -> loctrkd --- debian/changelog | 32 +++++++++---------- debian/control | 6 ++-- debian/gps303.collector.service | 17 ---------- debian/gps303.lookaside.service | 17 ---------- debian/gps303.ocid-dload.service | 12 ------- debian/gps303.storage.service | 17 ---------- debian/gps303.target | 15 --------- debian/gps303.termconfig.service | 17 ---------- debian/install | 4 +-- debian/lintian-overrides | 8 ++--- debian/loctrkd.collector.service | 17 ++++++++++ debian/{gps303.conf => loctrkd.conf} | 8 ++--- debian/{gps303.default => loctrkd.default} | 4 +-- debian/loctrkd.lookaside.service | 17 ++++++++++ debian/loctrkd.ocid-dload.service | 12 +++++++ ...d-dload.timer => loctrkd.ocid-dload.timer} | 4 +-- debian/loctrkd.storage.service | 17 ++++++++++ debian/loctrkd.target | 15 +++++++++ debian/loctrkd.termconfig.service | 17 ++++++++++ ...eway.service => loctrkd.wsgateway.service} | 12 +++---- debian/manpages | 4 +-- debian/postinst | 4 +-- debian/rules | 16 +++++----- docs/{gps303.1 => loctrkd.1} | 10 +++--- docs/{gps303.conf.5 => loctrkd.conf.5} | 14 ++++---- {gps303 => loctrkd}/__init__.py | 0 {gps303 => loctrkd}/__main__.py | 2 +- {gps303 => loctrkd}/collector.py | 2 +- {gps303 => loctrkd}/common.py | 6 ++-- {gps303 => loctrkd}/evstore.py | 0 {gps303 => loctrkd}/googlemaps.py | 0 {gps303 => loctrkd}/lookaside.py | 2 +- {gps303 => loctrkd}/mkgpx.py | 4 +-- {gps303 => loctrkd}/ocid_dload.py | 2 +- {gps303 => loctrkd}/opencellid.py | 0 {gps303 => loctrkd}/qry.py | 0 {gps303 => loctrkd}/storage.py | 2 +- {gps303 => loctrkd}/termconfig.py | 2 +- {gps303 => loctrkd}/watch.py | 2 +- {gps303 => loctrkd}/wsgateway.py | 2 +- {gps303 => loctrkd}/zmsg.py | 0 {gps303 => loctrkd}/zx303proto.py | 0 scripts/gps303 | 3 -- scripts/loctrkd | 3 ++ setup.py | 8 ++--- test/common.py | 2 +- test/test_black.py | 2 +- test/test_mypy.py | 2 +- test/test_ocid_dload.py | 2 +- test/test_storage.py | 4 +-- 50 files changed, 184 insertions(+), 184 deletions(-) delete mode 100644 debian/gps303.collector.service delete mode 100644 debian/gps303.lookaside.service delete mode 100644 debian/gps303.ocid-dload.service delete mode 100644 debian/gps303.storage.service delete mode 100644 debian/gps303.target delete mode 100644 debian/gps303.termconfig.service create mode 100644 debian/loctrkd.collector.service rename debian/{gps303.conf => loctrkd.conf} (85%) rename debian/{gps303.default => loctrkd.default} (64%) create mode 100644 debian/loctrkd.lookaside.service create mode 100644 debian/loctrkd.ocid-dload.service rename debian/{gps303.ocid-dload.timer => loctrkd.ocid-dload.timer} (64%) create mode 100644 debian/loctrkd.storage.service create mode 100644 debian/loctrkd.target create mode 100644 debian/loctrkd.termconfig.service rename debian/{gps303.wsgateway.service => loctrkd.wsgateway.service} (50%) rename docs/{gps303.1 => loctrkd.1} (84%) rename docs/{gps303.conf.5 => loctrkd.conf.5} (95%) rename {gps303 => loctrkd}/__init__.py (100%) rename {gps303 => loctrkd}/__main__.py (98%) rename {gps303 => loctrkd}/collector.py (99%) rename {gps303 => loctrkd}/common.py (96%) rename {gps303 => loctrkd}/evstore.py (100%) rename {gps303 => loctrkd}/googlemaps.py (100%) rename {gps303 => loctrkd}/lookaside.py (98%) rename {gps303 => loctrkd}/mkgpx.py (95%) rename {gps303 => loctrkd}/ocid_dload.py (99%) rename {gps303 => loctrkd}/opencellid.py (100%) rename {gps303 => loctrkd}/qry.py (100%) rename {gps303 => loctrkd}/storage.py (97%) rename {gps303 => loctrkd}/termconfig.py (98%) rename {gps303 => loctrkd}/watch.py (96%) rename {gps303 => loctrkd}/wsgateway.py (99%) rename {gps303 => loctrkd}/zmsg.py (100%) rename {gps303 => loctrkd}/zx303proto.py (100%) delete mode 100755 scripts/gps303 create mode 100755 scripts/loctrkd diff --git a/debian/changelog b/debian/changelog index 31b26ed..006574e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gps303 (1.02) experimental; urgency=medium +loctrkd (1.02) experimental; urgency=medium * collector: prevent two active clients share IMEI @@ -19,7 +19,7 @@ gps303 (1.00) experimental; urgency=medium -- Eugene Crosser Thu, 23 Jun 2022 22:58:35 +0200 -gps303 (0.99) experimental; urgency=medium +loctrkd (0.99) experimental; urgency=medium * Revive mkgpx example script * Drop data if we are receiving junk @@ -41,7 +41,7 @@ gps303 (0.99) experimental; urgency=medium -- Eugene Crosser Wed, 22 Jun 2022 18:04:10 +0200 -gps303 (0.98) experimental; urgency=medium +loctrkd (0.98) experimental; urgency=medium * include runtime deps as build-time for typecheck * fix l3str/l3int breakage provoked by typeckeck @@ -54,19 +54,19 @@ gps303 (0.98) experimental; urgency=medium -- Eugene Crosser Tue, 07 Jun 2022 00:17:55 +0200 -gps303 (0.97) experimental; urgency=medium +loctrkd (0.97) experimental; urgency=medium * adjust tests * typecheck: skip test if mypy verison < 0.942 -- Eugene Crosser Tue, 31 May 2022 01:05:39 +0200 -gps303 (0.96) experimental; urgency=medium +loctrkd (0.96) experimental; urgency=medium * Do not write startup message for command-line cmds * Add a (short) man page * typing: make zmsg.py typecheck - * typing: annotate gps303proto.py (mostly) + * typing: annotate loctrkdproto.py (mostly) * typechecking: less hacky deal with dynamic attrs * typing: annotate opencellid.py * typchecking: annotate googlemaps.py @@ -78,20 +78,20 @@ gps303 (0.96) experimental; urgency=medium * typeckecking: annotate storage.py * typing: annotate lookaside.py * typechecking: annotate collector.py - * typeckeck: annotate __main__ and fix gps303proto + * typeckeck: annotate __main__ and fix loctrkdproto * typeckecking: annotate wsgateway.py * formatting: revive black formatting * unittest: type checking and formatting -- Eugene Crosser Tue, 31 May 2022 00:36:33 +0200 -gps303 (0.95) experimental; urgency=medium +loctrkd (0.95) experimental; urgency=medium * Quick fix for a missing variable -- Eugene Crosser Thu, 26 May 2022 19:32:44 +0200 -gps303 (0.94) experimental; urgency=medium +loctrkd (0.94) experimental; urgency=medium * Opencellid download service * Improve error handling of the downloader @@ -101,7 +101,7 @@ gps303 (0.94) experimental; urgency=medium -- Eugene Crosser Thu, 26 May 2022 19:25:40 +0200 -gps303 (0.93) experimental; urgency=medium +loctrkd (0.93) experimental; urgency=medium * use fixed github action * try to make github actions work @@ -113,7 +113,7 @@ gps303 (0.93) experimental; urgency=medium -- Eugene Crosser Tue, 24 May 2022 22:53:13 +0200 -gps303 (0.92) experimental; urgency=low +loctrkd (0.92) experimental; urgency=low [ Eugene Crosser ] * "When you start a pattern with *, you must use quotes." @@ -125,14 +125,14 @@ gps303 (0.92) experimental; urgency=low -- Eugene Crosser Mon, 23 May 2022 23:55:46 +0200 -gps303 (0.91) experimental; urgency=low +loctrkd (0.91) experimental; urgency=low [ Eugene Crosser ] * fix log message using unknown variable -- Eugene Crosser Tue, 10 May 2022 09:42:30 +0200 -gps303 (0.90) experimental; urgency=low +loctrkd (0.90) experimental; urgency=low [ Eugene Crosser ] * Expand README @@ -150,7 +150,7 @@ gps303 (0.90) experimental; urgency=low -- Eugene Crosser Tue, 10 May 2022 09:09:08 +0200 -gps303 (0.01) experimental; urgency=low +loctrkd (0.01) experimental; urgency=low [ Eugene Crosser ] * adjust debianization to wsgateway @@ -181,7 +181,7 @@ gps303 (0.01) experimental; urgency=low * update gitignore debianization * debianize * add command line script - * cleanup of gps303proto + * cleanup of loctrkdproto * update mkgpx to the new api * export all classes * remove forgotten make_packet() call @@ -211,7 +211,7 @@ gps303 (0.01) experimental; urgency=low * initial storage service * make collector.py work * WIP to reorganise to microservices - * rename protocol module to "gps303proto" + * rename protocol module to "loctrkdproto" * Initial version of zmq based architecture * drop unresolvable points in mkgpx * add lookaside module and opencellid lookup diff --git a/debian/control b/debian/control index f9d0a55..329bf70 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,10 @@ -Source: gps303 +Source: loctrkd Maintainer: Eugene Crosser Section: misc Priority: optional Standards-Version: 4.5.1 X-Python-Version: >= 3.6 -Homepage: http://www.average.org/gps303 +Homepage: http://www.average.org/loctrkd Build-Depends: black, debhelper-compat (= 12), dh-python, @@ -15,7 +15,7 @@ Build-Depends: black, python3-wsproto, python3-zmq, -Package: python3-gps303 +Package: python3-loctrkd Architecture: all Section: python Depends: adduser, diff --git a/debian/gps303.collector.service b/debian/gps303.collector.service deleted file mode 100644 index 0f70acd..0000000 --- a/debian/gps303.collector.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=GPS303 Collector Service -PartOf=gps303.target - -[Service] -Type=simple -EnvironmentFile=-/etc/default/gps303 -ExecStart=python3 -m gps303.collector $OPTIONS -KillSignal=INT -Restart=on-failure -StandardOutput=journal -StandardError=inherit -User=gps303 -Group=gps303 - -[Install] -WantedBy=gps303.target diff --git a/debian/gps303.lookaside.service b/debian/gps303.lookaside.service deleted file mode 100644 index 058e048..0000000 --- a/debian/gps303.lookaside.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=GPS303 Lookaside Service -PartOf=gps303.target - -[Service] -Type=simple -EnvironmentFile=-/etc/default/gps303 -ExecStart=python3 -m gps303.lookaside $OPTIONS -KillSignal=INT -Restart=on-failure -StandardOutput=journal -StandardError=inherit -User=gps303 -Group=gps303 - -[Install] -WantedBy=gps303.target diff --git a/debian/gps303.ocid-dload.service b/debian/gps303.ocid-dload.service deleted file mode 100644 index 212fb49..0000000 --- a/debian/gps303.ocid-dload.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=GPS303 OpenCellID Download Service -Wants=gps303.ocid-dload.timer - -[Service] -Type=oneshot -EnvironmentFile=-/etc/default/gps303 -ExecStart=python3 -m gps303.ocid_dload $OPTIONS -StandardOutput=journal -StandardError=inherit -User=gps303 -Group=gps303 diff --git a/debian/gps303.storage.service b/debian/gps303.storage.service deleted file mode 100644 index 7266b14..0000000 --- a/debian/gps303.storage.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=GPS303 Storage Service -PartOf=gps303.target - -[Service] -Type=simple -EnvironmentFile=-/etc/default/gps303 -ExecStart=python3 -m gps303.storage $OPTIONS -KillSignal=INT -Restart=on-failure -StandardOutput=journal -StandardError=inherit -User=gps303 -Group=gps303 - -[Install] -WantedBy=gps303.target diff --git a/debian/gps303.target b/debian/gps303.target deleted file mode 100644 index ac1de37..0000000 --- a/debian/gps303.target +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=GPS303 support suite -Requires=gps303.collector.service \ - gps303.storage.service \ - gps303.termconfig.service \ - gps303.lookaside.service \ - gps303.wsgateway.service -After=gps303.collector.service \ - gps303.storage.service \ - gps303.termconfig.service \ - gps303.lookaside.service \ - gps303.wsgateway.service - -[Install] -WantedBy=multi-user.target diff --git a/debian/gps303.termconfig.service b/debian/gps303.termconfig.service deleted file mode 100644 index 0e75f89..0000000 --- a/debian/gps303.termconfig.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=GPS303 Termconfig Service -PartOf=gps303.target - -[Service] -Type=simple -EnvironmentFile=-/etc/default/gps303 -ExecStart=python3 -m gps303.termconfig $OPTIONS -KillSignal=INT -Restart=on-failure -StandardOutput=journal -StandardError=inherit -User=gps303 -Group=gps303 - -[Install] -WantedBy=gps303.target diff --git a/debian/install b/debian/install index 19a4586..44b5dd1 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1,2 @@ -debian/gps303.conf etc/ -webdemo/index.html var/lib/gps303/ +debian/loctrkd.conf etc/ +webdemo/index.html var/lib/loctrkd/ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index f349998..b14c41e 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,4 +1,4 @@ -python3-gps303: systemd-service-file-refers-to-unusual-wantedby-target gps303.target [lib/systemd/system/gps303.collector.service] -python3-gps303: systemd-service-file-refers-to-unusual-wantedby-target gps303.target [lib/systemd/system/gps303.lookaside.service] -python3-gps303: systemd-service-file-refers-to-unusual-wantedby-target gps303.target [lib/systemd/system/gps303.storage.service] -python3-gps303: systemd-service-file-refers-to-unusual-wantedby-target gps303.target [lib/systemd/system/gps303.termconfig.service] +python3-loctrkd: systemd-service-file-refers-to-unusual-wantedby-target loctrkd.target [lib/systemd/system/loctrkd.collector.service] +python3-loctrkd: systemd-service-file-refers-to-unusual-wantedby-target loctrkd.target [lib/systemd/system/loctrkd.lookaside.service] +python3-loctrkd: systemd-service-file-refers-to-unusual-wantedby-target loctrkd.target [lib/systemd/system/loctrkd.storage.service] +python3-loctrkd: systemd-service-file-refers-to-unusual-wantedby-target loctrkd.target [lib/systemd/system/loctrkd.termconfig.service] diff --git a/debian/loctrkd.collector.service b/debian/loctrkd.collector.service new file mode 100644 index 0000000..11d1311 --- /dev/null +++ b/debian/loctrkd.collector.service @@ -0,0 +1,17 @@ +[Unit] +Description=GPS303 Collector Service +PartOf=loctrkd.target + +[Service] +Type=simple +EnvironmentFile=-/etc/default/loctrkd +ExecStart=python3 -m loctrkd.collector $OPTIONS +KillSignal=INT +Restart=on-failure +StandardOutput=journal +StandardError=inherit +User=loctrkd +Group=loctrkd + +[Install] +WantedBy=loctrkd.target diff --git a/debian/gps303.conf b/debian/loctrkd.conf similarity index 85% rename from debian/gps303.conf rename to debian/loctrkd.conf index 087d5eb..d22214d 100644 --- a/debian/gps303.conf +++ b/debian/loctrkd.conf @@ -2,17 +2,17 @@ # configure your gps terminal with this SMS: # "server##4303#" port = 4303 -publishurl = ipc:///var/lib/gps303/collected -listenurl = ipc:///var/lib/gps303/responses +publishurl = ipc:///var/lib/loctrkd/collected +listenurl = ipc:///var/lib/loctrkd/responses # comma-separated list of tracker protocols to accept protocols = zx303proto [wsgateway] port = 5049 -htmlfile = /var/lib/gps303/index.html +htmlfile = /var/lib/loctrkd/index.html [storage] -dbfn = /var/lib/gps303/trkloc.sqlite +dbfn = /var/lib/loctrkd/trkloc.sqlite [lookaside] # "opencellid" and "googlemaps" can be here. Both require an access token, diff --git a/debian/gps303.default b/debian/loctrkd.default similarity index 64% rename from debian/gps303.default rename to debian/loctrkd.default index ed0c0cc..7b91fc7 100644 --- a/debian/gps303.default +++ b/debian/loctrkd.default @@ -1,5 +1,5 @@ -# Environment for gps303 suite +# Environment for loctrkd suite # Common command-line option for all daemons -#OPTIONS="-c /etc/gps303.conf -d" +#OPTIONS="-c /etc/loctrkd.conf -d" # Which lookaside service to use: opencellid or googleloc LOOKASIDE=opencellid diff --git a/debian/loctrkd.lookaside.service b/debian/loctrkd.lookaside.service new file mode 100644 index 0000000..0be3186 --- /dev/null +++ b/debian/loctrkd.lookaside.service @@ -0,0 +1,17 @@ +[Unit] +Description=GPS303 Lookaside Service +PartOf=loctrkd.target + +[Service] +Type=simple +EnvironmentFile=-/etc/default/loctrkd +ExecStart=python3 -m loctrkd.lookaside $OPTIONS +KillSignal=INT +Restart=on-failure +StandardOutput=journal +StandardError=inherit +User=loctrkd +Group=loctrkd + +[Install] +WantedBy=loctrkd.target diff --git a/debian/loctrkd.ocid-dload.service b/debian/loctrkd.ocid-dload.service new file mode 100644 index 0000000..9741336 --- /dev/null +++ b/debian/loctrkd.ocid-dload.service @@ -0,0 +1,12 @@ +[Unit] +Description=GPS303 OpenCellID Download Service +Wants=loctrkd.ocid-dload.timer + +[Service] +Type=oneshot +EnvironmentFile=-/etc/default/loctrkd +ExecStart=python3 -m loctrkd.ocid_dload $OPTIONS +StandardOutput=journal +StandardError=inherit +User=loctrkd +Group=loctrkd diff --git a/debian/gps303.ocid-dload.timer b/debian/loctrkd.ocid-dload.timer similarity index 64% rename from debian/gps303.ocid-dload.timer rename to debian/loctrkd.ocid-dload.timer index 5730f65..34b0509 100644 --- a/debian/gps303.ocid-dload.timer +++ b/debian/loctrkd.ocid-dload.timer @@ -1,9 +1,9 @@ [Unit] Description=Timer For GPS303 OpenCellID Download Service -Requires=gps303.ocid-dload.service +Requires=loctrkd.ocid-dload.service [Timer] -Unit=gps303.ocid-dload.service +Unit=loctrkd.ocid-dload.service OnCalendar=Weekly [Install] diff --git a/debian/loctrkd.storage.service b/debian/loctrkd.storage.service new file mode 100644 index 0000000..e890aa3 --- /dev/null +++ b/debian/loctrkd.storage.service @@ -0,0 +1,17 @@ +[Unit] +Description=GPS303 Storage Service +PartOf=loctrkd.target + +[Service] +Type=simple +EnvironmentFile=-/etc/default/loctrkd +ExecStart=python3 -m loctrkd.storage $OPTIONS +KillSignal=INT +Restart=on-failure +StandardOutput=journal +StandardError=inherit +User=loctrkd +Group=loctrkd + +[Install] +WantedBy=loctrkd.target diff --git a/debian/loctrkd.target b/debian/loctrkd.target new file mode 100644 index 0000000..50b71c0 --- /dev/null +++ b/debian/loctrkd.target @@ -0,0 +1,15 @@ +[Unit] +Description=GPS303 support suite +Requires=loctrkd.collector.service \ + loctrkd.storage.service \ + loctrkd.termconfig.service \ + loctrkd.lookaside.service \ + loctrkd.wsgateway.service +After=loctrkd.collector.service \ + loctrkd.storage.service \ + loctrkd.termconfig.service \ + loctrkd.lookaside.service \ + loctrkd.wsgateway.service + +[Install] +WantedBy=multi-user.target diff --git a/debian/loctrkd.termconfig.service b/debian/loctrkd.termconfig.service new file mode 100644 index 0000000..d91c985 --- /dev/null +++ b/debian/loctrkd.termconfig.service @@ -0,0 +1,17 @@ +[Unit] +Description=GPS303 Termconfig Service +PartOf=loctrkd.target + +[Service] +Type=simple +EnvironmentFile=-/etc/default/loctrkd +ExecStart=python3 -m loctrkd.termconfig $OPTIONS +KillSignal=INT +Restart=on-failure +StandardOutput=journal +StandardError=inherit +User=loctrkd +Group=loctrkd + +[Install] +WantedBy=loctrkd.target diff --git a/debian/gps303.wsgateway.service b/debian/loctrkd.wsgateway.service similarity index 50% rename from debian/gps303.wsgateway.service rename to debian/loctrkd.wsgateway.service index 3072f3b..bf83da8 100644 --- a/debian/gps303.wsgateway.service +++ b/debian/loctrkd.wsgateway.service @@ -1,17 +1,17 @@ [Unit] Description=GPS303 Websocket Gateway Service -PartOf=gps303.target +PartOf=loctrkd.target [Service] Type=simple -EnvironmentFile=-/etc/default/gps303 -ExecStart=python3 -m gps303.wsgateway $OPTIONS +EnvironmentFile=-/etc/default/loctrkd +ExecStart=python3 -m loctrkd.wsgateway $OPTIONS KillSignal=INT Restart=on-failure StandardOutput=journal StandardError=inherit -User=gps303 -Group=gps303 +User=loctrkd +Group=loctrkd [Install] -WantedBy=gps303.target +WantedBy=loctrkd.target diff --git a/debian/manpages b/debian/manpages index ef6d95c..8276d2f 100644 --- a/debian/manpages +++ b/debian/manpages @@ -1,2 +1,2 @@ -docs/gps303.1 -docs/gps303.conf.5 +docs/loctrkd.1 +docs/loctrkd.conf.5 diff --git a/debian/postinst b/debian/postinst index 84624e5..7cfe04c 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,8 +1,8 @@ #!/bin/sh set -e -adduser --system --group --home /var/lib/gps303 gps303 -install --owner gps303 --group gps303 --directory /var/lib/opencellid +adduser --system --group --home /var/lib/loctrkd loctrkd +install --owner loctrkd --group loctrkd --directory /var/lib/opencellid #DEBHELPER# diff --git a/debian/rules b/debian/rules index e2f6e32..b35833a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export PYBUILD_NAME=gps303 +export PYBUILD_NAME=loctrkd #export PYBUILD_BEFORE_TEST=cp -r mypystubs {build_dir} #export PYBUILD_AFTER_TEST=rm -rf {build_dir}/mypystubs @@ -9,10 +9,10 @@ export PYBUILD_NAME=gps303 override_dh_installsystemd: - dh_installsystemd --name=gps303 - dh_installsystemd --name=gps303.collector - dh_installsystemd --name=gps303.storage - dh_installsystemd --name=gps303.lookaside - dh_installsystemd --name=gps303.termconfig - dh_installsystemd --name=gps303.wsgateway - dh_installsystemd --name=gps303.ocid-dload + dh_installsystemd --name=loctrkd + dh_installsystemd --name=loctrkd.collector + dh_installsystemd --name=loctrkd.storage + dh_installsystemd --name=loctrkd.lookaside + dh_installsystemd --name=loctrkd.termconfig + dh_installsystemd --name=loctrkd.wsgateway + dh_installsystemd --name=loctrkd.ocid-dload diff --git a/docs/gps303.1 b/docs/loctrkd.1 similarity index 84% rename from docs/gps303.1 rename to docs/loctrkd.1 index 4df4d31..32b2543 100644 --- a/docs/gps303.1 +++ b/docs/loctrkd.1 @@ -2,11 +2,11 @@ .SH NAME -gps303 \- utility to send control messages to the GPS tracker terminal +loctrkd \- utility to send control messages to the GPS tracker terminal .SH SYNOPSIS -gps303 [-c /path/to/config/file] [-d] +loctrkd [-c /path/to/config/file] [-d] .SH DESCRIPTION @@ -22,7 +22,7 @@ Set "debug" level of logging .TP 0.5i .B -c /path/to/config -Location of the configuration file (default /etc/gps303.conf) +Location of the configuration file (default /etc/loctrkd.conf) .SH COMMANDS @@ -30,7 +30,7 @@ After the options, IMEI (16 decimal characters) and the command verb must be specified, optionally followed by a list of .B key=value pairs. The command verb is a case insensitive abbreviation that -uniquely identifies a class from the file gps303/gps303proto.py. +uniquely identifies a class from the file loctrkd/loctrkdproto.py. These classes correspond to message types recognized by the terminal. Only a few of them are useful to construct "unsolicited replies". .B key=value @@ -56,4 +56,4 @@ The program is inspired by the project petGPS by Thomas Obadia .SH SEE ALSO -.BR gps303.conf (5) +.BR loctrkd.conf (5) diff --git a/docs/gps303.conf.5 b/docs/loctrkd.conf.5 similarity index 95% rename from docs/gps303.conf.5 rename to docs/loctrkd.conf.5 index 877088c..cc13771 100644 --- a/docs/gps303.conf.5 +++ b/docs/loctrkd.conf.5 @@ -2,14 +2,14 @@ .SH NAME -gps303.conf \- Configuration file for GPS303 server +loctrkd.conf \- Configuration file for GPS303 server .SH DESCRIPTION Services that consitute -.BR gps303 (1) +.BR loctrkd (1) suite read configuration data from -.B /etc/gps303\&.conf +.B /etc/loctrkd\&.conf .PP The file in .B .ini @@ -54,12 +54,12 @@ Section contain the following parameters: .TP .B publishurl (string) \- Zeromq "pub" socket where events are published. Default -.BR ipc:///var/lib/gps303/collected . +.BR ipc:///var/lib/loctrkd/collected . .TP .B listenurl (string) \- Zeromq "pull" socket for messages to be sent to the terminal. Default -.BR ipc:///var/lib/gps303/responses . +.BR ipc:///var/lib/loctrkd/responses . .SS [wsgateway] .TP .B port @@ -71,7 +71,7 @@ Default .B .html file to be served for .IR non "-websocket requests. Default -.BR /var/lib/gps303/index.html . +.BR /var/lib/loctrkd/index.html . .SS [storage] .TP .B dbfn @@ -180,4 +180,4 @@ The program is inspired by the project petGPS by Thomas Obadia .SH SEE ALSO -.BR gps303 (1) +.BR loctrkd (1) diff --git a/gps303/__init__.py b/loctrkd/__init__.py similarity index 100% rename from gps303/__init__.py rename to loctrkd/__init__.py diff --git a/gps303/__main__.py b/loctrkd/__main__.py similarity index 98% rename from gps303/__main__.py rename to loctrkd/__main__.py index fcd07a6..c3dcb4b 100644 --- a/gps303/__main__.py +++ b/loctrkd/__main__.py @@ -13,7 +13,7 @@ from . import common from .zx303proto import * from .zmsg import Bcast, Resp -log = getLogger("gps303") +log = getLogger("loctrkd") def main( diff --git a/gps303/collector.py b/loctrkd/collector.py similarity index 99% rename from gps303/collector.py rename to loctrkd/collector.py index cb45d81..c6261d7 100644 --- a/gps303/collector.py +++ b/loctrkd/collector.py @@ -20,7 +20,7 @@ import zmq from . import common from .zmsg import Bcast, Resp -log = getLogger("gps303/collector") +log = getLogger("loctrkd/collector") MAXBUFFER: int = 4096 diff --git a/gps303/common.py b/loctrkd/common.py similarity index 96% rename from gps303/common.py rename to loctrkd/common.py index 9e53f4b..227611c 100644 --- a/gps303/common.py +++ b/loctrkd/common.py @@ -8,12 +8,12 @@ from pkg_resources import get_distribution, DistributionNotFound from sys import argv, stderr, stdout from typing import Any, Dict, List, Optional, Tuple, Union -CONF = "/etc/gps303.conf" +CONF = "/etc/loctrkd.conf" PORT = 4303 -DBFN = "/var/lib/gps303/gps303.sqlite" +DBFN = "/var/lib/loctrkd/loctrkd.sqlite" try: - version = get_distribution("gps303").version + version = get_distribution("loctrkd").version except DistributionNotFound: version = "" diff --git a/gps303/evstore.py b/loctrkd/evstore.py similarity index 100% rename from gps303/evstore.py rename to loctrkd/evstore.py diff --git a/gps303/googlemaps.py b/loctrkd/googlemaps.py similarity index 100% rename from gps303/googlemaps.py rename to loctrkd/googlemaps.py diff --git a/gps303/lookaside.py b/loctrkd/lookaside.py similarity index 98% rename from gps303/lookaside.py rename to loctrkd/lookaside.py index 2e759d1..31c3105 100644 --- a/gps303/lookaside.py +++ b/loctrkd/lookaside.py @@ -12,7 +12,7 @@ from . import common from .zx303proto import parse_message, proto_name, WIFI_POSITIONING from .zmsg import Bcast, Resp, topic -log = getLogger("gps303/lookaside") +log = getLogger("loctrkd/lookaside") def runserver(conf: ConfigParser) -> None: diff --git a/gps303/mkgpx.py b/loctrkd/mkgpx.py similarity index 95% rename from gps303/mkgpx.py rename to loctrkd/mkgpx.py index 02a0825..115dd80 100644 --- a/gps303/mkgpx.py +++ b/loctrkd/mkgpx.py @@ -1,7 +1,7 @@ """ Example that produces gpx from events in evstore """ # run as: -# python -m gps303.mkgpx +# python -m loctrkd.mkgpx # Generated gpx is emitted to stdout from datetime import datetime, timezone @@ -24,7 +24,7 @@ c.execute( print( """ Location Data diff --git a/gps303/ocid_dload.py b/loctrkd/ocid_dload.py similarity index 99% rename from gps303/ocid_dload.py rename to loctrkd/ocid_dload.py index dfd013f..525a8b0 100644 --- a/gps303/ocid_dload.py +++ b/loctrkd/ocid_dload.py @@ -8,7 +8,7 @@ from zlib import decompressobj, MAX_WBITS from . import common -log = getLogger("gps303/ocid_dload") +log = getLogger("loctrkd/ocid_dload") RURL = ( "https://opencellid.org/ocid/downloads" diff --git a/gps303/opencellid.py b/loctrkd/opencellid.py similarity index 100% rename from gps303/opencellid.py rename to loctrkd/opencellid.py diff --git a/gps303/qry.py b/loctrkd/qry.py similarity index 100% rename from gps303/qry.py rename to loctrkd/qry.py diff --git a/gps303/storage.py b/loctrkd/storage.py similarity index 97% rename from gps303/storage.py rename to loctrkd/storage.py index c9ac603..473806e 100644 --- a/gps303/storage.py +++ b/loctrkd/storage.py @@ -10,7 +10,7 @@ from .evstore import initdb, stow from .zx303proto import proto_of_message from .zmsg import Bcast -log = getLogger("gps303/storage") +log = getLogger("loctrkd/storage") def runserver(conf: ConfigParser) -> None: diff --git a/gps303/termconfig.py b/loctrkd/termconfig.py similarity index 98% rename from gps303/termconfig.py rename to loctrkd/termconfig.py index 4599dc2..f8f4b77 100644 --- a/gps303/termconfig.py +++ b/loctrkd/termconfig.py @@ -10,7 +10,7 @@ from . import common from .zx303proto import * from .zmsg import Bcast, Resp, topic -log = getLogger("gps303/termconfig") +log = getLogger("loctrkd/termconfig") def runserver(conf: ConfigParser) -> None: diff --git a/gps303/watch.py b/loctrkd/watch.py similarity index 96% rename from gps303/watch.py rename to loctrkd/watch.py index 098209c..a8a53b0 100644 --- a/gps303/watch.py +++ b/loctrkd/watch.py @@ -9,7 +9,7 @@ from . import common from .zx303proto import parse_message from .zmsg import Bcast -log = getLogger("gps303/watch") +log = getLogger("loctrkd/watch") def runserver(conf: ConfigParser) -> None: diff --git a/gps303/wsgateway.py b/loctrkd/wsgateway.py similarity index 99% rename from gps303/wsgateway.py rename to loctrkd/wsgateway.py index 7dc2fcd..522cd59 100644 --- a/gps303/wsgateway.py +++ b/loctrkd/wsgateway.py @@ -31,7 +31,7 @@ from .zx303proto import ( ) from .zmsg import Bcast, topic -log = getLogger("gps303/wsgateway") +log = getLogger("loctrkd/wsgateway") htmlfile = None diff --git a/gps303/zmsg.py b/loctrkd/zmsg.py similarity index 100% rename from gps303/zmsg.py rename to loctrkd/zmsg.py diff --git a/gps303/zx303proto.py b/loctrkd/zx303proto.py similarity index 100% rename from gps303/zx303proto.py rename to loctrkd/zx303proto.py diff --git a/scripts/gps303 b/scripts/gps303 deleted file mode 100755 index d9876b7..0000000 --- a/scripts/gps303 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec python3 -m gps303 $* diff --git a/scripts/loctrkd b/scripts/loctrkd new file mode 100755 index 0000000..5f932cc --- /dev/null +++ b/scripts/loctrkd @@ -0,0 +1,3 @@ +#!/bin/sh + +exec python3 -m loctrkd $* diff --git a/setup.py b/setup.py index c3f2736..7988154 100644 --- a/setup.py +++ b/setup.py @@ -8,17 +8,17 @@ with open("debian/changelog", "r") as clog: )[0] setup( - name="gps303", + name="loctrkd", version=version, description="Suite of daemons to collect reports from xz303 GPS trackers", - url="http://www.average.org/gps303/", + url="http://www.average.org/loctrkd/", author="Eugene Crosser", author_email="crosser@average.org", install_requires=["zeromq"], license="MIT", packages=[ - "gps303", + "loctrkd", ], - scripts=["scripts/gps303"], + scripts=["scripts/loctrkd"], long_description=open("README.md").read(), ) diff --git a/test/common.py b/test/common.py index 3bf8f08..df43023 100644 --- a/test/common.py +++ b/test/common.py @@ -64,7 +64,7 @@ class TestWithServers(TestCase): kwargs = {"handle_hibernate": False} else: kwargs = {} - cls = import_module("gps303." + srvname, package=".") + cls = import_module("loctrkd." + srvname, package=".") if verbose: cls.log.addHandler(StreamHandler(stderr)) cls.log.setLevel(DEBUG) diff --git a/test/test_black.py b/test/test_black.py index cc72eae..4922749 100644 --- a/test/test_black.py +++ b/test/test_black.py @@ -21,7 +21,7 @@ class BlackFormatter(TestCase): self.fail(f"black not installed.") cmd = ( ["black", "--check", "--diff", "-l", "79"] - + glob("gps303/**/*.py", recursive=True) + + glob("loctrkd/**/*.py", recursive=True) + glob("test/**/*.py", recursive=True) ) output = run(cmd, capture_output=True) diff --git a/test/test_mypy.py b/test/test_mypy.py index d93f568..e4bf8c6 100644 --- a/test/test_mypy.py +++ b/test/test_mypy.py @@ -19,7 +19,7 @@ class TypeCheck(TestCase): "mypy", "--strict", "--ignore-missing-imports", - "gps303", + "loctrkd", "test", ] self.assertEqual(call(cmd), 0, "mypy typecheck") diff --git a/test/test_ocid_dload.py b/test/test_ocid_dload.py index 0089ce0..d194b64 100644 --- a/test/test_ocid_dload.py +++ b/test/test_ocid_dload.py @@ -5,7 +5,7 @@ from time import sleep from typing import Any import unittest from .common import send_and_drain, TestWithServers -from gps303 import ocid_dload +from loctrkd import ocid_dload class Ocid_Dload(TestWithServers): diff --git a/test/test_storage.py b/test/test_storage.py index 869ab18..4737f52 100644 --- a/test/test_storage.py +++ b/test/test_storage.py @@ -7,8 +7,8 @@ from time import sleep from typing import Any import unittest from .common import send_and_drain, TestWithServers -from gps303.zx303proto import * -from gps303.ocid_dload import SCHEMA +from loctrkd.zx303proto import * +from loctrkd.ocid_dload import SCHEMA class Storage(TestWithServers): -- 2.39.2