more work on csv imports

andli · Jun 2, 2020 · 0d2f2be · 0d2f2be
1 parent c9d0eb3
commit 0d2f2be
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added progress bar to wantslists cleanup.
 
+### Fixed
+
+- Split card names got a better handling in CSV import
+- The ligature `Æ` got better handling in CSV import
+
 ## [1.6.3]
 
 ### Added

diff --git a/list.csv b/list.csv
@@ -1,2 +1,2 @@
 Card,Set Name,Quantity,Foil,Language
-Dragon Breath,Scourge,1,Foil,French
+Aether Vial,Iconic Masters,4,,English
diff --git a/main.py b/main.py
@@ -5,7 +5,7 @@
 """
 
 __author__ = "Andreas Ehrlund"
-__version__ = "1.6.3"
+__version__ = "1.6.4"
 __license__ = "MIT"
 
 from pymkm_app import PyMkmApp

diff --git a/pymkm_app.py b/pymkm_app.py
@@ -4,7 +4,7 @@
 """
 
 __author__ = "Andreas Ehrlund"
-__version__ = "1.6.3"
+__version__ = "1.6.4"
 __license__ = "MIT"
 
 import csv
@@ -616,7 +616,9 @@ def import_from_csv(self, api):
                     (name, set_name, count, foil, language, *other) = row_array
                     if all(v != "" for v in [name, set_name, count]):
                         try:
-                            possible_products = api.find_product(name)["product"]
+                            possible_products = api.find_product(name, idGame="1")[
+                                "product"
+                            ]
                         except Exception as err:
                             problem_cards.append(row_array)
                         else:
@@ -631,6 +633,16 @@ def import_from_csv(self, api):
                                 or (
                                     # filter for flip card / split card names
                                     "/" in x["enName"]
+                                    and x["enName"].startswith(name)
+                                    and x["expansionName"] == set_name
+                                    and x["categoryName"] == "Magic Single"
+                                )
+                                or (
+                                    # filter for the ligature Æ
+                                    "Æ"
+                                    in x[
+                                        "enName"
+                                    ]  # TODO: add some sort of string distance
                                     and x["expansionName"] == set_name
                                     and x["categoryName"] == "Magic Single"
                                 )
@@ -661,7 +673,7 @@ def import_from_csv(self, api):
                                     "condition": "NM",
                                     "isFoil": ("true" if foil else "false"),
                                 }
-                                # api.add_stock([card])
+                                api.add_stock([card])
                             else:
                                 problem_cards.append(row_array)
                     else:

diff --git a/pymkm_helper.py b/pymkm_helper.py
@@ -4,7 +4,7 @@
 """
 
 __author__ = "Andreas Ehrlund"
-__version__ = "1.6.3"
+__version__ = "1.6.4"
 __license__ = "MIT"
 
 import math

diff --git a/pymkmapi.py b/pymkmapi.py
@@ -4,7 +4,7 @@
 """
 
 __author__ = "Andreas Ehrlund"
-__version__ = "1.6.3"
+__version__ = "1.6.4"
 __license__ = "MIT"
 
 import sys