Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
teeworlds_srvbrowse
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
minus
teeworlds_srvbrowse
Commits
8f0d857d
Commit
8f0d857d
authored
Sep 24, 2013
by
m!nus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed obsolete list types
changed __repr__ to __str__
parent
b49acfe7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
75 deletions
+5
-75
teeworlds/list.py
teeworlds/list.py
+0
-70
teeworlds/master.py
teeworlds/master.py
+1
-1
teeworlds/player.py
teeworlds/player.py
+1
-1
teeworlds/server.py
teeworlds/server.py
+1
-1
teeworlds/teeworlds.py
teeworlds/teeworlds.py
+2
-2
No files found.
teeworlds/list.py
deleted
100644 → 0
View file @
b49acfe7
import
re
import
logging
logging
.
basicConfig
(
format
=
"[%(asctime)s] %(levelname)s: %(funcName)s: %(message)s"
,
level
=
logging
.
DEBUG
)
L
=
logging
.
getLogger
(
__name__
)
from
.server
import
Server
from
.player
import
Player
class
ServerList
(
object
):
def
__init__
(
self
):
self
.
servers
=
[]
def
add
(
self
,
server
):
if
not
isinstance
(
server
,
Server
):
raise
Exception
(
'Trying to add non-Server object'
)
self
.
servers
.
append
(
server
)
def
find
(
self
,
**
kwargs
):
output
=
ServerList
()
for
server
in
self
.
servers
:
if
server
.
match
(
**
kwargs
):
output
.
add
(
server
)
return
output
def
sort
(
self
,
cmp
=
None
,
key
=
None
,
reverse
=
False
):
self
.
servers
.
sort
(
cmp
,
key
,
reverse
)
def
reverse
(
self
):
self
.
players
.
reverse
()
def
__iter__
(
self
):
return
iter
(
self
.
servers
)
def
__repr__
(
self
):
return
str
(
self
.
servers
)
class
PlayerList
(
object
):
def
__init__
(
self
):
self
.
players
=
[]
def
add
(
self
,
player
):
if
not
isinstance
(
player
,
Player
):
raise
Exception
(
'Trying to add non-Player-object'
)
self
.
players
.
append
(
player
)
def
find
(
self
,
name
=
None
,
clan
=
None
,
country
=
None
,
playing
=
None
,
server
=
None
):
output
=
PlayerList
()
if
name
:
name
=
re
.
compile
(
name
,
re
.
IGNORECASE
)
if
clan
:
clan
=
re
.
compile
(
clan
,
re
.
IGNORECASE
)
for
player
in
self
.
players
:
if
(
name
==
None
or
name
.
search
(
player
.
name
))
and
\
(
clan
==
None
or
clan
.
search
(
player
.
clan
))
and
\
(
country
==
None
or
player
.
country
==
country
)
and
\
(
server
==
None
or
player
.
server
==
server
)
and
\
(
playing
==
None
or
player
.
playing
==
playing
):
output
.
add
(
player
)
return
output
def
sort
(
self
,
cmp
=
None
,
key
=
None
,
reverse
=
False
):
self
.
players
.
sort
(
cmp
,
key
,
reverse
)
def
reverse
(
self
):
self
.
players
.
reverse
()
def
__iter__
(
self
):
return
iter
(
self
.
players
)
def
__repr__
(
self
):
return
str
(
self
.
players
)
\ No newline at end of file
teeworlds/master.py
View file @
8f0d857d
...
...
@@ -92,7 +92,7 @@ class MasterServer(object):
self
.
on_count_receive
(
self
.
count
)
L
.
debug
(
"Count: {}"
.
format
(
self
.
count
))
def
__
rep
r__
(
self
):
def
__
st
r__
(
self
):
return
"<MasterServer name='{name}' address='{address}' servers='{server_count}'>"
.
format
(
name
=
self
.
name
,
address
=
self
.
address
,
server_count
=
len
(
self
.
serverlist
))
"""
...
...
teeworlds/player.py
View file @
8f0d857d
...
...
@@ -11,5 +11,5 @@ class Player(object):
self
.
server
=
None
self
.
playing
=
None
def
__
rep
r__
(
self
):
def
__
st
r__
(
self
):
return
"<Player name='{name}'>"
.
format
(
name
=
self
.
name
)
teeworlds/server.py
View file @
8f0d857d
...
...
@@ -101,7 +101,7 @@ class Server(object):
raise
self
.
on_info_receive
(
self
)
def
__
rep
r__
(
self
):
def
__
st
r__
(
self
):
return
"<Server name='{name}' address='{address}' master='{master}'>"
.
format
(
**
self
.
__dict__
)
"""
...
...
teeworlds/teeworlds.py
View file @
8f0d857d
...
...
@@ -26,9 +26,9 @@ from .base import get_address
from
.master
import
MasterServer
def
create_masters
(
eventsocket
):
def
create_masters
(
eventsocket
,
hostnames
=
[
"master{}.teeworlds.com"
.
format
(
i
+
1
)
for
i
in
range
(
4
)]
):
masterlist
=
[]
for
mastername
in
[
"master{}.teeworlds.com"
.
format
(
i
+
1
)
for
i
in
range
(
4
)]
:
for
mastername
in
hostnames
:
# resolves host and picks the first address
master_addr
=
get_address
(
mastername
,
port
=
8300
)
if
master_addr
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment