fixes

make more use of --detail, move age to -vv

make more use of --detail, move age to -vv

Author: kfsone

tradedangerous/commands/local_cmd.py

@@ -123,7 +123,7 @@ def run(results: CommandResults, cmdenv: CommandEnv, tdb: TradeORM | None) -> Co
 
     query = (
         select(candidate, distance_sq)
-        .where(distance_sq < range_sq)
+        .where(distance_sq <= range_sq)
         .order_by(distance_sq)
     )
 
@@ -135,8 +135,8 @@ def run(results: CommandResults, cmdenv: CommandEnv, tdb: TradeORM | None) -> Co
             station_filters.append(Station.market == 'Y')
         if cmdenv.blackMarket:
             station_filters.append(Station.blackmarket == 'Y')
-        if cmdenv.mxLs:
-            station_filters.append(Station.ls_from_star <= cmdenv.lsFromStar)
+        if cmdenv.maxLs:
+            station_filters.append(and_(Station.ls_from_star > 0, Station.ls_from_star <= cmdenv.maxLs))
         if cmdenv.outfitting:
             station_filters.append(Station.outfitting == 'Y')
 
@@ -229,9 +229,6 @@ def render(results, cmdenv, tdb):
         ).append(
                 ColumnFormat("StnLs", '>', maxLsLen, "n",
                     key=lambda stn: int(stn.ls_from_star or 0))
-        ).append(
-                ColumnFormat("Age/days", '>', 7,
-                        key=lambda stn: (round((now - stn.modified).total_seconds() / 86400, 2)) if stn.modified else "n/a")
         ).append(
                 ColumnFormat("Mkt", '>', '3',
                     key=lambda stn: TRISTATE_LABELS[stn.market])
@@ -267,6 +264,10 @@ def render(results, cmdenv, tdb):
                     key=lambda stn: TRISTATE_LABELS[stn.odyssey])
         )
         if cmdenv.detail > 1:
+            stnRowFmt = stnRowFmt.append(
+                ColumnFormat("Age/days", '>', 7,
+                            key=lambda stn: (round((now - stn.modified).total_seconds() / 86400, 2)) if stn.modified else "n/a")
+            )
             stnRowFmt.append(
                 ColumnFormat("Itms", ">", 4,
                     key=lambda stn: len(stn.items))
@@ -287,12 +288,13 @@ def render(results, cmdenv, tdb):
 
     for row in results.rows:
         cmdenv.uprint(sysRowFmt.format(row))
-        stations = row.system.stations if results.summary.show_stations else []
-        truncated = False
-        if results.summary.limit:
+        if not results.summary.show_stations:
+            continue
+        stations = row.system.stations
+        truncate = results.summary.limit > 0 and len(stations) > results.summary.limit
+        if truncate:
             stations = stations[:results.summary.limit]
-            truncated = True
         for stnRow in stations:
             cmdenv.uprint(stnRowFmt.format(stnRow))
-        if truncated:
+        if truncate:
             cmdenv.uprint(f"  /  ... {len(row.system.stations) - results.summary.limit} more ...")