fxreader.online/freelance-project-34-marketing-blog
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[~] Refactor

Browse Source
This commit is contained in:
Siarhei Siniak 2023-01-08 11:53:00 +03:00
parent c9d1c9ffa1
commit 507bb9f12a
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dotfiles/.local/bin/commands
View File

@ -1313,6 +1313,9 @@ def desktop_services(argv):
def terminate(self, *args, **kwargs): def terminate(self, *args, **kwargs):
return self.swayidle.terminate(*args, **kwargs) return self.swayidle.terminate(*args, **kwargs)
def wait(self, *args, **kwargs):
return self.swayidle.wait(*args, **kwargs)
def kill(self): def kill(self):
return self.swayidle.kill() return self.swayidle.kill()
@ -1386,9 +1389,11 @@ def desktop_services(argv):
print('done t4') print('done t4')
self.release_lock() self.release_lock()
elif o == 't5': elif o == 't5':
print('started timeout resume')
if self.force_idle(): if self.force_idle():
subprocess.check_call(self.commands['lock'], shell=True) subprocess.check_call(self.commands['lock'], shell=True)
subprocess.check_call(self.commands['resume'], shell=True), subprocess.check_call(self.commands['resume'], shell=True),
print('done timeout resume')
elif o == 't6': elif o == 't6':
print('started before-sleep') print('started before-sleep')
if self.force_idle(): if self.force_idle():
@ -1397,11 +1402,18 @@ def desktop_services(argv):
print('done before-sleep') print('done before-sleep')
self.release_lock() self.release_lock()
elif o == 't7': elif o == 't7':
print('started resume') print('started after-resume')
if self.force_idle(): #if self.force_idle():
subprocess.check_call(self.commands['lock'], shell=True) #subprocess.check_call(self.commands['lock'], shell=True)
subprocess.check_call(self.commands['resume'], shell=True), while True:
print('done resume') if subprocess.call(
self.commands['resume'],
shell=True
) == 0:
break
else:
time.sleep(0.5)
print('done after-resume')
self.release_lock() self.release_lock()
else: else:
raise NotImplementedError raise NotImplementedError
@ -1429,8 +1441,10 @@ def desktop_services(argv):
finally: finally:
for o in services: for o in services:
try: try:
o.terminate(timeout=10) o.terminate()
o.wait(timeout=10)
except: except:
logging.error(traceback.format_exc())
logging.error('killed %s' % str(o.__dict__)) logging.error('killed %s' % str(o.__dict__))
o.kill() o.kill()
@ -1891,6 +1905,8 @@ def commands_cli():
share_wifi(sys.argv[2:]) share_wifi(sys.argv[2:])
elif sys.argv[1] == 'socat-ssh': elif sys.argv[1] == 'socat-ssh':
socat_ssh(sys.argv[2:]) socat_ssh(sys.argv[2:])
elif sys.argv[1] == 'sway_sock':
print(sway_sock())
elif sys.argv[1] == 'suspend-timer': elif sys.argv[1] == 'suspend-timer':
suspend_timer(sys.argv[2:]) suspend_timer(sys.argv[2:])
elif sys.argv[1] == 'desktop-services': elif sys.argv[1] == 'desktop-services':

2
dotfiles/.sway/config
View File

@ -71,7 +71,7 @@ input type:touchpad {
# #
# Basics: # Basics:
# #
bindsym $mod+Shift+l exec loginctl lock-session --no-ask-password bindsym $mod+Shift+l exec loginctl list-sessions | tail '-n' +2 | head -n -2 | awk '{print $1}' | xargs loginctl lock-session
# Start a terminal # Start a terminal
bindsym $mod+t exec $term bindsym $mod+t exec $term

2
dotfiles/.zshrc
View File

@ -22,5 +22,5 @@ eval `keychain --eval --quiet`
if [[ $TTY == "/dev/tty1" ]] { if [[ $TTY == "/dev/tty1" ]] {
#exec startx #exec startx
exec sh -c $'sway -d 2>&1 | logger -d --tag sway --id=$(pgrep -i \'sway$\');' exec sh -c $'sway 2>&1 | logger -d --tag sway --id=$(pgrep -i \'sway$\');'
} }