Merged in tKe/tradedangerous/buy-improvements (pull request #87)

Buy command: Ship support and fix large --ly distance bug
eyeonus · Jan 16, 2015 · e90e59e · e90e59e
2 parents a2f29f0 + 2177bb0
commit e90e59e
Showing 1 changed file with 60 additions and 30 deletions.
diff --git a/commands/buy_cmd.py b/commands/buy_cmd.py
@@ -63,31 +63,49 @@
 
 def run(results, cmdenv, tdb):
     from commands.commandenv import ResultRow
-
-    item = tdb.lookupItem(cmdenv.item)
-    cmdenv.DEBUG0("Looking up item {} (#{})", item.name(), item.ID)
+    try:
+        item = tdb.lookupItem(cmdenv.item)
+        cmdenv.DEBUG0("Looking up item {} (#{})", item.name(), item.ID)
+    except LookupError:
+        item = tdb.lookupShip(cmdenv.item)
+        cmdenv.DEBUG0("Looking up ship {} (#{})", item.name(), item.ID)
+        cmdenv.ship = True
 
     results.summary = ResultRow()
     results.summary.item = item
 
     if cmdenv.detail:
-        avgPrice = tdb.query("""
-                SELECT CAST(AVG(ss.price) AS INT)
-                  FROM StationSelling AS ss
-                 WHERE ss.item_id = ?
-        """, [item.ID]).fetchone()[0]
-        results.summary.avg = avgPrice
+        if cmdenv.ship:
+            results.summary.avg = item.cost
+        else:
+            avgPrice = tdb.query("""
+                    SELECT CAST(AVG(ss.price) AS INT)
+                      FROM StationSelling AS ss
+                     WHERE ss.item_id = ?
+            """, [item.ID]).fetchone()[0]
+            results.summary.avg = avgPrice
 
     # Constraints
-    tables = "StationSelling AS ss"
-    constraints = [ "(item_id = {})".format(item.ID) ]
-    columns = [
+    if cmdenv.ship:
+        tables = "ShipVendor AS ss"
+        constraints = [ "(ship_id = {})".format(item.ID) ]
+        columns = [
+            'ss.station_id',
+            '0',
+            '1',
+            "0",
+            ]
+        bindValues = [ ]
+    else:
+        tables = "StationSelling AS ss"
+        constraints = [ "(item_id = {})".format(item.ID) ]
+        columns = [
             'ss.station_id',
             'ss.price',
             'ss.units',
             "JULIANDAY('NOW') - JULIANDAY(ss.modified)",
-    ]
-    bindValues = [ ]
+            ]
+        bindValues = [ ]
 
     if cmdenv.quantity:
         constraints.append("(units = -1 or units >= ?)")
@@ -108,14 +126,21 @@ def run(results, cmdenv, tdb):
                     includeSelf=True,
             )
         }
-        tables += (
-                " INNER JOIN Station AS stn"
-                " ON (stn.station_id = ss.station_id)"
-        )
-        constraints.append("(stn.system_id IN ({}))".format(
-            ",".join(['?'] * len(systemRanges))
-        ))
-        bindValues += list(system.ID for system in systemRanges.keys())
+        # We need to ensure we use less than 999 bind values in total.
+        # If we don't filter in the query, we'll filter by stations in
+        # systemRanges when building our result rows
+        if len(systemRanges) > 999-len(bindValues):
+            cmdenv.DEBUG0("Too many matching systems ({}) for SQL filter. "
+                          "Hard way it is.".format(len(systemRanges)))
+        else:
+            tables += (
+                    " INNER JOIN Station AS stn"
+                    " ON (stn.station_id = ss.station_id)"
+            )
+            constraints.append("(stn.system_id IN ({}))".format(
+                ",".join(['?'] * len(systemRanges))
+            ))
+            bindValues += list(system.ID for system in systemRanges.keys())
 
     whereClause = ' AND '.join(constraints)
     stmt = """
@@ -140,7 +165,10 @@ def run(results, cmdenv, tdb):
         row = ResultRow()
         row.station = station
         if nearSystem:
-           row.dist = systemRanges[row.station.system]
+            # check the system was in our range query
+            if row.station.system not in systemRanges:
+                continue
+            row.dist = systemRanges[row.station.system]
         row.price = priceCr
         row.stock = stock
         row.age = age
@@ -179,17 +207,19 @@ def render(results, cmdenv, tdb):
     stnRowFmt = RowFormat()
     stnRowFmt.addColumn('Station', '<', longestNameLen,
             key=lambda row: row.station.name())
-    stnRowFmt.addColumn('Cost', '>', 10, 'n',
-            key=lambda row: row.price)
-    stnRowFmt.addColumn('Stock', '>', 10,
-            key=lambda row: '{:n}'.format(row.stock) if row.stock >= 0 else '?')
+    if not cmdenv.ship:
+        stnRowFmt.addColumn('Cost', '>', 10, 'n',
+                key=lambda row: row.price)
+        stnRowFmt.addColumn('Stock', '>', 10,
+                key=lambda row: '{:n}'.format(row.stock) if row.stock >= 0 else '?')
 
     if cmdenv.nearSystem:
         stnRowFmt.addColumn('DistLy', '>', 6, '.2f',
                 key=lambda row: row.dist)
 
-    stnRowFmt.addColumn('Age/days', '>', 7, '.2f',
-            key=lambda row: row.age)
+    if not cmdenv.ship:
+        stnRowFmt.addColumn('Age/days', '>', 7, '.2f',
+                key=lambda row: row.age)
     stnRowFmt.addColumn("StnLs", '>', 10,
             key=lambda row: row.station.distFromStar())
     stnRowFmt.addColumn('B/mkt', '>', 4,
@@ -206,7 +236,7 @@ def render(results, cmdenv, tdb):
 
     if cmdenv.detail:
         print("{:{lnl}} {:>10n}".format(
-                "-- Average",
+                "-- Average" if not cmdenv.ship else "-- Ship Cost",
                 results.summary.avg,
                 lnl=longestNameLen,
         ))