From 121605fb88151cb45acd0a52298040decac84bfb Mon Sep 17 00:00:00 2001
From: Rossen Georgiev <rossen@rgp.io>
Date: Wed, 22 Jul 2015 10:04:03 +0100
Subject: [PATCH] SteamID can now init with steam2 id

---
 README.rst       |  8 ++++---
 steam/steamid.py | 56 ++++++++++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/README.rst b/README.rst
index 49b8fdc..4afad08 100644
--- a/README.rst
+++ b/README.rst
@@ -70,6 +70,7 @@ SteamID
 
     >>> SteamID(12345)  # accountid
     >>> SteamID('12345')
+    >>> SteamID('STEAM_1:1:6172')  # steam2
     SteamID(id=12345, type='Individual', universe='Public', instance=1)
 
     >>> SteamID(103582791429521412)  # steam64
@@ -77,7 +78,8 @@ SteamID
     >>> SteamID('[g:1:4]')  # steam3
     SteamID(id=4, type='Clan', universe='Public', instance=0)
 
-    # vanity urls are resolved by making an HTTP request
+    # vanity urls are resolved by fetching the community profile page (this is unstable)
+    # use the WebAPI to reliably resolve vanity urls
     >>> SteamID('https://steamcommunity.com/id/drunkenf00l')
     >>> SteamID('http://steamcommunity.com/profiles/76561197968459473')  # no request is made
     SteamID(id=8193745, type='Individual', universe='Public', instance=1)
@@ -91,8 +93,8 @@ SteamID
     103582791429521412
     >>> str(group)
     '103582791429521412'
-    >>> group.as_steam2
-    'STEAM_0:0:2'
+    >>> group.as_steam2 # only works for 'Individual' accounts
+    'STEAM_1:0:2'
     >>> group.as_steam3
     '[g:1:4]'
     >>> group.community_url
diff --git a/steam/steamid.py b/steam/steamid.py
index 12b885e..3e139d0 100644
--- a/steam/steamid.py
+++ b/steam/steamid.py
@@ -33,10 +33,14 @@ class SteamID(object):
         SteamID(id=12345, type='Invalid', universe='Invalid', instance=0)
         SteamID(103582791429521412)  # steam64
         SteamID('103582791429521412')
+        SteamID('STEAM_1:0:2')  # steam2
         SteamID('[g:1:4]')  # steam3
-        SteamID('https://steamcommunity.com/id/drunkenf00l')  # vanity url
         SteamID('http://steamcommunity.com/profiles/76561197968459473')
 
+        # WARNING: vainty url resolving is fragile
+        # it might break if community profile page changes
+        # you should use the WebAPI to resolve them reliably
+        SteamID('https://steamcommunity.com/id/drunkenf00l')
         """
 
         largs = len(args)
@@ -89,6 +93,20 @@ class SteamID(object):
 
             # textual input e.g. [g:1:4]
             else:
+                # try steam2
+                match = re.match(r"^STEAM_(?P<universe>\d+)"
+                                 r":(?P<reminder>[0-1])"
+                                 r":(?P<id>\d+)$", value
+                                 )
+
+                if match:
+                    self.id = (int(match.group('id')) << 1) | int(match.group('reminder'))
+                    self.universe = EUniverse(int(match.group('universe')))
+                    self.type = EType(1)
+                    self.instance = 1
+                    return
+
+                # try steam3
                 typeChars = ''.join(self.ETypeChar.values())
                 match = re.match(r"^\["
                                  r"(?P<type>[%s]):"        # type char
@@ -97,23 +115,24 @@ class SteamID(object):
                                  r"(:(?P<instance>\d+))?"  # instance
                                  r"\]$" % typeChars, value
                                  )
-                if not match:
-                    raise ValueError("Expected a number or textual SteamID"
-                                     " (e.g. [g:1:4]), got %s" % repr(value)
-                                     )
-
-                self.id = int(match.group('id'))
-                self.universe = EUniverse(int(match.group('universe')))
-                inverseETypeChar = dict((b, a) for (a, b) in self.ETypeChar.items())
-                self.type = EType(inverseETypeChar[match.group('type')])
-                self.instance = match.group('instance')
-                if self.instance is None:
-                    if self.type in (EType.Individual, EType.GameServer):
-                        self.instance = 1
+                if match:
+                    self.id = int(match.group('id'))
+                    self.universe = EUniverse(int(match.group('universe')))
+                    inverseETypeChar = dict((b, a) for (a, b) in self.ETypeChar.items())
+                    self.type = EType(inverseETypeChar[match.group('type')])
+                    self.instance = match.group('instance')
+                    if self.instance is None:
+                        if self.type in (EType.Individual, EType.GameServer):
+                            self.instance = 1
+                        else:
+                            self.instance = 0
                     else:
-                        self.instance = 0
-                else:
-                    self.instance = int(self.instance)
+                        self.instance = int(self.instance)
+                    return
+
+                raise ValueError("Expected a number or textual SteamID"
+                                 " (e.g. [g:1:4], STEAM_0:1:1234), got %s" % repr(value)
+                                 )
 
         elif lkwargs > 0:
             if 'id' not in kwargs:
@@ -156,7 +175,8 @@ class SteamID(object):
 
     @property
     def as_steam2(self):
-        return "STEAM_0:%s:%s" % (
+        return "STEAM_%s:%s:%s" % (
+            self.universe.value,
             self.id % 2,
             self.id >> 1,
             )