Merge pull request #48 from Project-Path-of-Exile-Wiki/dev

3.16 - Pre-release merge, patch version 2.
Project-Path-of-Exile-Wiki · Nov 9, 2021 · 789aab3 · 789aab3
2 parents c1682a8 + 4e1304e
commit 789aab3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/PyPoE/cli/exporter/util.py b/PyPoE/cli/exporter/util.py
@@ -75,8 +75,6 @@ def get_content_path():
 
 
 def fix_path(path: str) -> str:
-    #First, replace any double quotes with HTML-encoded quotes
-    path = path.replace('\"','&quot;')
     if re.search('[a-zA-Z]:.*', path) is not None:
         return path[:2] + re.sub(r':', '_', path[2:])
     else:

diff --git a/PyPoE/cli/exporter/wiki/handler.py b/PyPoE/cli/exporter/wiki/handler.py
@@ -58,10 +58,10 @@
 
 WIKIS = {
     'English': 'www.poewiki.net/w',
-    'Russian': 'pathofexile-ru.gamepedia.com',
-    'German': 'pathofexile-de.gamepedia.com',
-    'French': 'pathofexile-fr.gamepedia.com',
-    'Spanish': 'pathofexile-es.gamepedia.com',
+    'Russian': 'pathofexile.fandom.com/ru',
+    'German': 'pathofexile.fandom.com/de',
+    'French': 'pathofexile.fandom.com/fr',
+    'Spanish': 'pathofexile.fandom.com/es',
 }
 
 # =============================================================================

diff --git a/PyPoE/cli/exporter/wiki/parsers/item.py b/PyPoE/cli/exporter/wiki/parsers/item.py
@@ -3717,6 +3717,8 @@ def _export(self, parsed_args, items):
             cls_id = base_item_type['ItemClassesKey']['Id']
             m_id = base_item_type['Id']
 
+            self._print_item_rowid(parsed_args, base_item_type)
+
             infobox = OrderedDict()
             self._process_base_item_type(base_item_type, infobox)
             self._process_purchase_costs(base_item_type, infobox)
@@ -3804,6 +3806,23 @@ def _export(self, parsed_args, items):
 
         return r
 
+    def _print_item_rowid(self, parsed_args, base_item_type):
+        #Don't print anything if not running in the rowid mode.
+        if not set(['start', 'end']).issubset(vars(parsed_args).keys()):
+            return
+
+        export_row_count = parsed_args.end - parsed_args.start
+        #If we're printing less than 100 rows, print every rowid
+        if export_row_count <= 100:
+            print_granularity = 1
+        else:
+            print_granularity = export_row_count//100
+
+        item_offset = base_item_type.rowid - parsed_args.start
+        if (item_offset == 0) or item_offset % print_granularity == 0:
+            console(f"Processing item with rowid {base_item_type.rowid}: {base_item_type['Name']}")
+        return
+
     def _format_map_name(self, base_item_type, map_series, language=None):
         if language is None:
             language = self._language

diff --git a/PyPoE/cli/exporter/wiki/parsers/lua.py b/PyPoE/cli/exporter/wiki/parsers/lua.py
@@ -1439,8 +1439,8 @@ def DetermineModifier(val):
         #     'key': 'mod_group',
         #     'default': '',
         # }),
-        ('CraftingItemClassCategories', {
-            'key': 'crafting_item_class_categories',
+        ('CraftingItemClassCategoriesKeys', {
+            'key': 'item_class_categories',
             'value': lambda v: [k['Text'] for k in v],
         }),
         # ('CraftingBenchUnlockCategoriesKeys', {

diff --git a/PyPoE/cli/exporter/wiki/parsers/skill.py b/PyPoE/cli/exporter/wiki/parsers/skill.py
@@ -742,7 +742,7 @@ def export(self, parsed_args, skills):
             if not parsed_args.allow_skill_gems and skill in \
                     self.rr['SkillGems.dat'].index['GrantedEffectsKey']:
                 console(
-                    'Skipping skill gem skill "%s"' % skill['Id'],
+                    f"Skipping skill gem skill \"{skill['Id']}\" at row {skill.rowid}",
                     msg=Msg.warning)
                 continue
             data = OrderedDict()
@@ -751,7 +751,7 @@ def export(self, parsed_args, skills):
                 self._skill(ge=skill, infobox=data, parsed_args=parsed_args)
             except Exception as e:
                 console(
-                    'Error when parsing skill "%s":' % skill['Id'],
+                    f"Error when parsing skill \"{skill['Id']}\" at {skill.rowid}:",
                     msg=Msg.error)
                 console(traceback.format_exc(), msg=Msg.error)