Skip to content

Commit

Permalink
Convert to python3
Browse files Browse the repository at this point in the history
  • Loading branch information
Dragoncraft89 committed Dec 22, 2018
1 parent be09cd7 commit cf8912b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
10 changes: 5 additions & 5 deletions kdeconnect-ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class KDEConnectExtension(GObject.GObject, Nautilus.MenuProvider):
def __init__(self):
pass
GObject.Object.__init__(self)

def zipdir(self, path, ziph):
# ziph is zipfile handle
Expand All @@ -31,8 +31,8 @@ def menu_activate_cb(self, menu, files, device_id, device_name, folder_list):
files.append(zipfile)

send_files(files, device_id, device_name)
# for folder_name in folder_list:
# os.remove(folder_name[7:] + '.zip')
for folder_name in folder_list:
os.remove(folder_name[7:] + '.zip')

def get_file_items(self, window, files):
try:
Expand All @@ -49,8 +49,8 @@ def get_file_items(self, window, files):
folder_list.append(files[i].get_uri())

files = files_new
print files
print folder_list
print(files)
print(folder_list)

if (len(files_new) + len(folder_list) < 1):
return []
Expand Down
8 changes: 5 additions & 3 deletions kdeconnect.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def send_files(files, device_id, device_name):
# results=[]
# failed=0
for file in files:
print "filename", file.get_uri()
print("filename", file.get_uri())
return_code=call(["kdeconnect-cli", "-d", device_id, "--share", file.get_uri()])
# if (return_code != 0):
# failed += 1
Expand All @@ -15,10 +15,12 @@ def send_files(files, device_id, device_name):

def get_available_devices():
devices_a=[]
devices = check_output(["kdeconnect-cli", "-a"]).strip().split("\n")
devices = check_output(["kdeconnect-cli", "-a"]).decode("utf-8").strip().split("\n")
devices.pop()
print(devices)
for device in devices:
device_name=re.search("(?<=-\s).+(?=:\s)", device).group(0)
device_id=re.search("(?<=:\s)[a-z0-9]+(?=\s\()", device).group(0).strip()
device_id=re.search("(?<=:\s)[a-z0-9_]+(?=\s\()", device).group(0).strip()
devices_a.append({ "name": device_name, "id": device_id })
print(devices_a)
return devices_a

0 comments on commit cf8912b

Please sign in to comment.