use python -m instead of scripts

Author: scivision

README.md

@@ -32,7 +32,7 @@ pip install -e mozilla-location-wifi/
 ## Usage
 
 ```sh
-MozLoc
+python -m mozloc
 ```
 
 Shows `time` `lat` `lng` `accuracy` `N BSSIDs heard`.
@@ -41,7 +41,7 @@ In urban areas, accuracy of less than 100 meters is possible.
 ### dump raw signals
 
 ```sh
-mozloc_signal
+python -m mozloc.signal
 ```
 
 ### Windows
@@ -54,7 +54,7 @@ You may need to disconnect from WiFi (leave WiFi enabled) to make your WiFi chip
 Display logged data in Google Earth or other KML viewer after converting from CSV to KML:
 
 ```sh
-python csv2kml.py in.log out.kml
+python -m mozloc.csv2kml in.log out.kml
 ```
 
 which uses

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mozloc
-version = 1.3.0
+version = 1.4.0
 author = Michael Hirsch, Ph.D.
 author_email = scivision@users.noreply.github.com
 url = https://github.com/scivision/mozilla-location-wifi
@@ -45,9 +45,3 @@ lint =
   types-requests
 io =
   simplekml
-
-[options.entry_points]
-console_scripts =
-  MozLoc = mozloc.__main__:mozilla_location
-  mozloc_signal = mozloc.__main__:wifi_signal
-  mozloc_csv2kml = mozloc.__main__:csv2kml

src/mozloc/__main__.py

@@ -7,51 +7,25 @@
 Don't abuse the API or you'll get banned (excessive polling rate)
 """
 
-from .base import log_wifi_loc, process_file
-from .modules import get_signal
-
-import pandas
-from argparse import ArgumentParser
-
-
-def wifi_signal():
-
-    wifi = get_signal()
-    if isinstance(wifi, pandas.DataFrame):
-        print(wifi)
-    else:
-        # list of dict
-        for s in wifi:
-            print(s)
+import argparse
 
+from .base import log_wifi_loc, process_file
 
-def mozilla_location():
-    p = ArgumentParser()
-    p.add_argument("logfile", help="logfile to append location to", nargs="?")
-    p.add_argument(
-        "-T", "--cadence", help="how often to update [sec]. Some laptops cannot go faster than 30 sec.", default=60, type=float
-    )
-    p.add_argument(
-        "-url",
-        help="Mozilla location services URL--don't use this default test key",
-        default="https://location.services.mozilla.com/v1/geolocate?key=test",
-    )
-    p.add_argument("-i", "--infile", help="use raw text saved from command line")
-    p = p.parse_args()
-
-    if p.infile:
-        process_file(p.infile, mozilla_url=p.url)
-    else:
-        log_wifi_loc(cadence_sec=p.cadence, mozilla_url=p.url, logfile=p.logfile)
-
-
-def csv2kml():
-    """convert logged positions to KML"""
-    from .utils import csv2kml
-
-    p = ArgumentParser()
-    p.add_argument("logfn", help="csv logfile to read")
-    p.add_argument("kmlfn", help="kml filename to write")
-    p = p.parse_args()
 
-    csv2kml(p.logfn, p.kmlfn)
+p = argparse.ArgumentParser()
+p.add_argument("logfile", help="logfile to append location to", nargs="?")
+p.add_argument(
+    "-T", "--cadence", help="how often to update [sec]. Some laptops cannot go faster than 30 sec.", default=60, type=float
+)
+p.add_argument(
+    "-url",
+    help="Mozilla location services URL--don't use this default test key",
+    default="https://location.services.mozilla.com/v1/geolocate?key=test",
+)
+p.add_argument("-i", "--infile", help="use raw text saved from command line")
+p = p.parse_args()
+
+if p.infile:
+    process_file(p.infile, mozilla_url=p.url)
+else:
+    log_wifi_loc(cadence_sec=p.cadence, mozilla_url=p.url, logfile=p.logfile)

src/mozloc/csv2kml/__init__.py

@@ -0,0 +1,12 @@
+"""convert logged positions to KML"""
+
+import argparse
+
+from ..utils import csv2kml
+
+p = argparse.ArgumentParser()
+p.add_argument("logfn", help="csv logfile to read")
+p.add_argument("kmlfn", help="kml filename to write")
+p = p.parse_args()
+
+csv2kml(p.logfn, p.kmlfn)

src/mozloc/csv2kml/__main__.py

@@ -0,0 +1,5 @@
+from pprint import pprint
+from ..modules import get_signal, parse_signal
+
+
+pprint(parse_signal(get_signal()))