Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug fix 12 #15

Merged
merged 16 commits into from
Sep 26, 2021
Merged

Bug fix 12 #15

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fb67ed0
added functionality for catalina
stevenj2019 Oct 14, 2020
4799b85
added command for 17.x
stevenj2019 Oct 19, 2020
20a3f4f
fixed for Mojave
stevenj2019 Nov 5, 2020
64a0bf9
Merge pull request #2 from stevenj2019/bug-fix-12
stevenj2019 Nov 7, 2020
9374e38
code cleanup
stevenj2019 Nov 23, 2020
d84cdf9
removed irrelevant code
stevenj2019 Nov 30, 2020
fd7de2a
removed more messy code
stevenj2019 Nov 30, 2020
1b40672
changed file metadata
stevenj2019 Nov 30, 2020
a1bde1a
Merge remote-tracking branch 'upstream/dev' into dev
stevenj2019 Jan 19, 2021
f8b74c7
Merge branch 'dev' into bug-fix-12
stevenj2019 Jan 19, 2021
fc70bd2
test commit
stevenj2019 Jan 19, 2021
6ba154b
Merge remote-tracking branch 'upstream/dev' into dev
stevenj2019 Jan 21, 2021
1fc111e
code cleanup. still no bug fix
stevenj2019 Jan 21, 2021
ad729f5
code clean, further code testing needed for PR
stevenj2019 Jan 30, 2021
7cfc9ae
resolved conflict
stevenj2019 Jan 31, 2021
e3f047d
Update __init__.py
maltfield Sep 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/packages/buskill/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

File: buskill.py
Authors: Michael Altfield <michael@buskill.in>
Co-Auth: Steven Johnson <steven.j2019@protonmail.com>
Created: 2020-06-23
Updated: 2020-08-09
Updated: 2020-11-30
Version: 0.2

This is the heart of the buskill app, shared by both the cli and gui
Expand All @@ -19,6 +20,7 @@

import platform, multiprocessing, traceback, subprocess
import urllib.request, re, json, certifi, sys, os, math, shutil, tempfile, random, gnupg
import os.path
from buskill_version import BUSKILL_VERSION
from distutils.version import LooseVersion
from hashlib import sha256
Expand Down Expand Up @@ -200,6 +202,7 @@ def __init__(self):

# instantiate instance fields
self.CURRENT_PLATFORM = None
self.KERNEL_VERSION = None
self.IS_PLATFORM_SUPPORTED = False
self.OS_NAME_SHORT = None
self.ERR_PLATFORM_NOT_SUPPORTED = None
Expand Down Expand Up @@ -280,6 +283,8 @@ def __init__(self):
if CURRENT_PLATFORM.startswith( 'DARWIN' ):
self.IS_PLATFORM_SUPPORTED = True
self.OS_NAME_SHORT = 'mac'

self.KERNEL_VERSION = str(platform.release()).split('.')[0]
self.ARM_FUNCTION = self.armNix
self.TRIGGER_FUNCTION = self.triggerMac

Expand Down Expand Up @@ -658,12 +663,11 @@ def triggerWin(self):
def triggerMac(self):
msg = "DEBUG: BusKill lockscreen trigger executing now"
print( msg ); logger.info( msg )

try:
subprocess.run( ['pmset', 'displaysleepnow'] )
except FileNotFoundError as e:
subprocess.run( ['/System/Library/CoreServices/Menu Extras/user.menu/Contents/Resources/CGSession', '-suspend'] )

subprocess.call( ['/System/Library/CoreServices/Menu Extras/user.menu/Contents/Resources/CGSession', '-suspend'] )
except:
msg = "ERROR: Mac Kernel" + self.KERNEL_VERSION + "Unsupported"
print( msg ); logger.error(msg)
#####################
# UPGRADE FUNCTIONS #
#####################
Expand Down Expand Up @@ -771,7 +775,7 @@ def integrity_is_ok( self, sha256sums_filepath, local_filepaths ):

return True

def get_upgrade_status(self):
f def get_upgrade_status(self):

# is the message (upgrade_status_msg) a string that we can read from
# directly (running synchronously) or a multiprocessing.Array() because
Expand Down