Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
client
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
59aa364c
authored
Jul 07, 2014
by
Csók Tamás
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correction in cloud.py and a windows icon for windows
parent
318fac09
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
dist/cloud.ico
+0
-0
dist/cloud.py
+9
-4
No files found.
dist/cloud.ico
0 → 100644
View file @
59aa364c
File added
dist/cloud.py
View file @
59aa364c
...
...
@@ -34,7 +34,7 @@ def pars_arguments():
parser
.
add_argument
(
"-u"
,
"--username"
,
type
=
str
)
parser
.
add_argument
(
"-p"
,
"--password"
,
type
=
str
)
parser
.
add_argument
(
"-d"
,
"--driver"
,
help
=
"Select webdriver. Aside from Firefox, you have to install first the proper driver."
,
\
type
=
str
,
choices
=
[
'firefox'
,
'chrome'
,
'ie'
,
'opera'
,
'safari'
],
default
=
"firefox"
)
type
=
str
,
choices
=
[
'firefox'
,
'chrome'
,
'ie'
,
'opera'
],
default
=
"firefox"
)
parser
.
add_argument
(
"-o"
,
"--old"
,
help
=
"Use old interface"
,
action
=
"store_true"
)
args
=
parser
.
parse_args
();
return
args
...
...
@@ -54,8 +54,6 @@ class Browser:
self
.
driver
=
webdriver
.
Ie
()
elif
args
.
driver
==
"opera"
:
self
.
driver
=
webdriver
.
Opera
()
elif
args
.
driver
==
"safari"
:
self
.
driver
=
webdriver
.
Safari
()
self
.
driver
.
implicitly_wait
(
10
)
##
...
...
@@ -96,6 +94,7 @@ class Browser:
driver
.
find_element_by_css_selector
(
"a[href*='/logout/']"
)
.
click
()
except
:
print
"Browser session timed out!"
raise
return
vm
##
...
...
@@ -127,6 +126,7 @@ class Browser:
driver
.
find_element_by_css_selector
(
"a[href*='/logout/']"
)
.
click
()
except
:
print
"Browser session timed out!"
raise
return
vm
##
...
...
@@ -138,6 +138,7 @@ class Browser:
# kapcsolódunk a klienshez
def
main
():
try
:
args
=
pars_arguments
()
if
args
.
uri
is
not
None
:
vm
=
Struct
()
...
...
@@ -146,17 +147,21 @@ def main():
vm
.
state
=
"RUN"
else
:
browser
=
Browser
(
args
)
try
:
if
args
.
old
:
vm
=
browser
.
old_main
()
else
:
vm
=
browser
.
main
()
browser
.
driver
.
quit
()
except
:
raise
if
platform
.
system
()
==
"Linux"
:
from
cloud_connect_from_linux
import
connect
elif
platform
.
system
()
==
"Windows"
:
from
cloud_connect_from_windows
import
connect
if
vm
.
state
.
upper
()[:
3
]
in
(
"FUT"
,
"RUN"
):
connect
(
vm
)
except
:
pass
if
__name__
==
"__main__"
:
main
()
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