mirror
/
ValvePython.steam
mirror of https://github.com/ValvePython/steam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

enums now inherit from int and split enum.py

pull/18/merge
Rossen Georgiev 9 years ago
parent
c5885dfa05
commit
e29e576cff
6 changed files with 150 additions and 166 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      steam/client/cm.py
  2. 3
      steam/client/msg.py
  3. 1
      steam/enums/__init__.py
  4. 6
      steam/enums/base.py
  5. 137
      steam/enums/common.py
  6. 166
      steam/enums/emsg.py

3
steam/client/cm.py
View File

@ -14,7 +14,8 @@ from gevent import queue
from Crypto.Random import random
from steam.steamid import SteamID
from steam.enums import EMsg, EResult, EUniverse
from steam.enums import EResult, EUniverse
from steam.enums.emsg import EMsg
from steam.client import crypto
from steam.client.connection import TCPConnection
from steam.client.msg import is_proto, clear_proto_bit

3
steam/client/msg.py
View File

@ -1,6 +1,7 @@
import struct
import fnmatch
from steam.enums import EMsg, EUniverse, EResult
from steam.enums import EResult, EUniverse
from steam.enums.emsg import EMsg
from steam.protobufs import steammessages_base_pb2
from steam.protobufs import steammessages_clientserver_pb2
from steam.protobufs import steammessages_clientserver_2_pb2

1
steam/enums/__init__.py
View File

@ -0,0 +1 @@
from steam.enums.common import EResult, EType, EUniverse, EServerType

6
steam/enums/base.py
View File

@ -0,0 +1,6 @@
from enum import IntEnum
class SteamIntEnum(IntEnum):
def __str__(self):
return self.name

137
steam/enums/common.py
View File

@ -0,0 +1,137 @@
from steam.enums.base import SteamIntEnum
class EResult(SteamIntEnum):
Invalid = 0
OK = 1 # success
Fail = 2 # generic failure
NoConnection = 3 # no/failed network connection
sultNoConnectionRetry = 4 # OBSOLETE - removed
InvalidPassword = 5 # password/ticket is invalid
LoggedInElsewhere = 6 # same user logged in elsewhere
InvalidProtocolVer = 7 # protocol version is incorrect
InvalidParam = 8 # a parameter is incorrect
FileNotFound = 9 # file was not found
Busy = 10 # called method busy - action not taken
InvalidState = 11 # called object was in an invalid state
InvalidName = 12 # name is invalid
InvalidEmail = 13 # email is invalid
DuplicateName = 14 # name is not unique
AccessDenied = 15 # access is denied
Timeout = 16 # operation timed out
Banned = 17 # VAC2 banned
AccountNotFound = 18 # account not found
InvalidSteamID = 19 # steamID is invalid
ServiceUnavailable = 20 # The requested service is currently unavailable
NotLoggedOn = 21 # The user is not logged on
Pending = 22 # Request is pending (may be in process, or waiting on third party)
EncryptionFailure = 23 # Encryption or Decryption failed
InsufficientPrivilege = 24 # Insufficient privilege
LimitExceeded = 25 # Too much of a good thing
Revoked = 26 # Access has been revoked (used for revoked guest passes)
Expired = 27 # License/Guest pass the user is trying to access is expired
AlreadyRedeemed = 28 # Guest pass has already been redeemed by account, cannot be acked again
DuplicateRequest = 29 # The request is a duplicate and the action has already occurred in the past, ignored this time
AlreadyOwned = 30 # All the games in this guest pass redemption request are already owned by the user
IPNotFound = 31 # IP address not found
PersistFailed = 32 # failed to write change to the data store
LockingFailed = 33 # failed to acquire access lock for this operation
LogonSessionReplaced = 34,
ConnectFailed = 35,
HandshakeFailed = 36,
IOFailure = 37,
RemoteDisconnect = 38,
ShoppingCartNotFound = 39 # failed to find the shopping cart requested
Blocked = 40 # a user didn't allow it
Ignored = 41 # target is ignoring sender
NoMatch = 42 # nothing matching the request found
AccountDisabled = 43,
ServiceReadOnly = 44 # this service is not accepting content changes right now
AccountNotFeatured = 45 # account doesn't have value, so this feature isn't available
AdministratorOK = 46 # allowed to take this action, but only because requester is admin
ContentVersion = 47 # A Version mismatch in content transmitted within the Steam protocol.
TryAnotherCM = 48 # The current CM can't service the user making a request, user should try another.
PasswordRequiredToKickSession = 49 # You are already logged in elsewhere, this cached credential login has failed.
AlreadyLoggedInElsewhere = 50 # You are already logged in elsewhere, you must wait
Suspended = 51,
Cancelled = 52,
DataCorruption = 53,
DiskFull = 54,
RemoteCallFailed = 55,
class EUniverse(SteamIntEnum):
Invalid = 0
Public = 1
Beta = 2
Internal = 3
Dev = 4
Max = 5
class EType(SteamIntEnum):
Invalid = 0
Individual = 1
Multiseat = 2
GameServer = 3
AnonGameServer = 4
Pending = 5
ContentServer = 6
Clan = 7
Chat = 8
ConsoleUser = 9
AnonUser = 10
Max = 11
class EServerType(SteamIntEnum):
Invalid = -1
Shell = 0
GM = 1
BUM = 2
AM = 3
BS = 4
VS = 5
ATS = 6
CM = 7
FBS = 8
FG = 9
SS = 10
DRMS = 11
HubOBSOLETE = 12
Console = 13
ASBOBSOLETE = 14
Client = 15
BootstrapOBSOLETE = 16
DP = 17
WG = 18
SM = 19
UFS = 21
Util = 23
DSS = 24
P2PRelayOBSOLETE = 25
AppInformation = 26
Spare = 27
FTS = 28
EPM = 29
PS = 30
IS = 31
CCS = 32
DFS = 33
LBS = 34
MDS = 35
CS = 36
GC = 37
NS = 38
OGS = 39
WebAPI = 40
UDS = 41
MMS = 42
GMS = 43
KGS = 44
UCM = 45
RM = 46
FS = 47
Econ = 48
Backpack = 49
Max = 50

166
steam/enums.py → steam/enums/emsg.py
View File

@ -1,33 +1,7 @@
from enum import Enum
import sys
if sys.version_info > (3,):
long = int
from steam.enums.base import SteamIntEnum
class EasyEnum(Enum):
def __int__(self):
return self.value
def __str__(self):
return self.name
def __eq__(self, other):
if isinstance(other, (int, long)):
return self.value == other
else:
return NotImplemented
def __ne__(self, other):
if isinstance(other, (int, long)):
return self.value != other
else:
return NotImplemented
def __call__(self):
return int(self)
class EMsg(EasyEnum):
class EMsg(SteamIntEnum):
Invalid = 0
Multi = 1
@ -1826,139 +1800,3 @@ class EMsg(EasyEnum):
ClientVoiceCallPreAuthorize = 9800
ClientVoiceCallPreAuthorizeResponse = 9801
class EResult(EasyEnum):
Invalid = 0
OK = 1 # success
Fail = 2 # generic failure
NoConnection = 3 # no/failed network connection
sultNoConnectionRetry = 4 # OBSOLETE - removed
InvalidPassword = 5 # password/ticket is invalid
LoggedInElsewhere = 6 # same user logged in elsewhere
InvalidProtocolVer = 7 # protocol version is incorrect
InvalidParam = 8 # a parameter is incorrect
FileNotFound = 9 # file was not found
Busy = 10 # called method busy - action not taken
InvalidState = 11 # called object was in an invalid state
InvalidName = 12 # name is invalid
InvalidEmail = 13 # email is invalid
DuplicateName = 14 # name is not unique
AccessDenied = 15 # access is denied
Timeout = 16 # operation timed out
Banned = 17 # VAC2 banned
AccountNotFound = 18 # account not found
InvalidSteamID = 19 # steamID is invalid
ServiceUnavailable = 20 # The requested service is currently unavailable
NotLoggedOn = 21 # The user is not logged on
Pending = 22 # Request is pending (may be in process, or waiting on third party)
EncryptionFailure = 23 # Encryption or Decryption failed
InsufficientPrivilege = 24 # Insufficient privilege
LimitExceeded = 25 # Too much of a good thing
Revoked = 26 # Access has been revoked (used for revoked guest passes)
Expired = 27 # License/Guest pass the user is trying to access is expired
AlreadyRedeemed = 28 # Guest pass has already been redeemed by account, cannot be acked again
DuplicateRequest = 29 # The request is a duplicate and the action has already occurred in the past, ignored this time
AlreadyOwned = 30 # All the games in this guest pass redemption request are already owned by the user
IPNotFound = 31 # IP address not found
PersistFailed = 32 # failed to write change to the data store
LockingFailed = 33 # failed to acquire access lock for this operation
LogonSessionReplaced = 34,
ConnectFailed = 35,
HandshakeFailed = 36,
IOFailure = 37,
RemoteDisconnect = 38,
ShoppingCartNotFound = 39 # failed to find the shopping cart requested
Blocked = 40 # a user didn't allow it
Ignored = 41 # target is ignoring sender
NoMatch = 42 # nothing matching the request found
AccountDisabled = 43,
ServiceReadOnly = 44 # this service is not accepting content changes right now
AccountNotFeatured = 45 # account doesn't have value, so this feature isn't available
AdministratorOK = 46 # allowed to take this action, but only because requester is admin
ContentVersion = 47 # A Version mismatch in content transmitted within the Steam protocol.
TryAnotherCM = 48 # The current CM can't service the user making a request, user should try another.
PasswordRequiredToKickSession = 49 # You are already logged in elsewhere, this cached credential login has failed.
AlreadyLoggedInElsewhere = 50 # You are already logged in elsewhere, you must wait
Suspended = 51,
Cancelled = 52,
DataCorruption = 53,
DiskFull = 54,
RemoteCallFailed = 55,
class EUniverse(EasyEnum):
Invalid = 0
Public = 1
Beta = 2
Internal = 3
Dev = 4
Max = 5
class EType(EasyEnum):
Invalid = 0
Individual = 1
Multiseat = 2
GameServer = 3
AnonGameServer = 4
Pending = 5
ContentServer = 6
Clan = 7
Chat = 8
ConsoleUser = 9
AnonUser = 10
Max = 11
class EServerType(EasyEnum):
Invalid = -1
Shell = 0
GM = 1
BUM = 2
AM = 3
BS = 4
VS = 5
ATS = 6
CM = 7
FBS = 8
FG = 9
SS = 10
DRMS = 11
HubOBSOLETE = 12
Console = 13
ASBOBSOLETE = 14
Client = 15
BootstrapOBSOLETE = 16
DP = 17
WG = 18
SM = 19
UFS = 21
Util = 23
DSS = 24
P2PRelayOBSOLETE = 25
AppInformation = 26
Spare = 27
FTS = 28
EPM = 29
PS = 30
IS = 31
CCS = 32
DFS = 33
LBS = 34
MDS = 35
CS = 36
GC = 37
NS = 38
OGS = 39
WebAPI = 40
UDS = 41
MMS = 42
GMS = 43
KGS = 44
UCM = 45
RM = 46
FS = 47
Econ = 48
Backpack = 49
Max = 50
Write Preview
Loading…
Cancel
Save