Skip to content

Upload functionality has been fixed #73

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

Open
matevosashot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upload functionality has been fixed #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f9a10f
The following thigs are fixed:
matevosashot Jun 17, 2023
2c929fc
fix deleting files in remote
matevosashot Jun 18, 2023
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
29 changes: 20 additions & 9 deletions olsync/olbrowserlogin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# Where to get the CSRF Token and where to send the login request to
LOGIN_URL = "https://www.overleaf.com/login"
PROJECT_URL = "https://www.overleaf.com/project" # The dashboard URL
# JS snippet to get the first link
JAVASCRIPT_EXTRACT_PROJECT_URL = "document.getElementsByClassName('dash-cell-name')[1].firstChild.href"
# JS snippet to extract the csrfToken
JAVASCRIPT_CSRF_EXTRACTOR = "document.getElementsByName('ol-csrfToken')[0].content"
# Name of the cookies we want to extract
Expand Down Expand Up @@ -54,15 +56,24 @@ def __init__(self, *args, **kwargs):
self.resize(600, 700)

def handle_load_finished(self):
def callback(result):
self._csrf = result
self._login_success = True
QCoreApplication.quit()

if self.webview.url().toString() == PROJECT_URL:
self.webview.page().runJavaScript(
JAVASCRIPT_CSRF_EXTRACTOR, 0, callback
)
def callback(result):

def callback(result):
self._csrf = result
self._login_success = True
QCoreApplication.quit()

self.webview.load(QUrl.fromUserInput(result))
self.webview.loadFinished.connect( lambda x:
self.webview.page().runJavaScript(
JAVASCRIPT_CSRF_EXTRACTOR, 0, callback
)
)

if self.webview.url().toString() == PROJECT_URL:
self.webview.page().runJavaScript(
JAVASCRIPT_EXTRACT_PROJECT_URL, 0, callback
)

def handle_cookie_added(self, cookie):
cookie_name = cookie.name().data().decode('utf-8')
Expand Down
57 changes: 42 additions & 15 deletions olsync/olclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import uuid
from socketIO_client import SocketIO
import time
import re

# Where to get the CSRF Token and where to send the login request to
LOGIN_URL = "https://www.overleaf.com/login"
Expand All @@ -23,7 +24,7 @@
DOWNLOAD_URL = "https://www.overleaf.com/project/{}/download/zip"
UPLOAD_URL = "https://www.overleaf.com/project/{}/upload" # The URL to upload files
FOLDER_URL = "https://www.overleaf.com/project/{}/folder" # The URL to create folders
DELETE_URL = "https://www.overleaf.com/project/{}/doc/{}" # The URL to delete files
DELETE_URL = "https://www.overleaf.com/project/{}/{}/{}" # The URL to delete files
COMPILE_URL = "https://www.overleaf.com/project/{}/compile?enable_pdf_caching=true" # The URL to compile the project
BASE_URL = "https://www.overleaf.com" # The Overleaf Base URL
PATH_SEP = "/" # Use hardcoded path separator for both windows and posix system
Expand Down Expand Up @@ -89,9 +90,9 @@ def all_projects(self):
"""
projects_page = reqs.get(PROJECT_URL, cookies=self._cookie)
json_content = json.loads(
BeautifulSoup(projects_page.content, 'html.parser').find('meta', {'name': 'ol-projects'}).get('content'))
return list(OverleafClient.filter_projects(json_content))

BeautifulSoup(projects_page.content, 'html.parser').find("meta", {"content": re.compile('\{.*"projects".*\}')}).get('content'))
return list(OverleafClient.filter_projects(json_content['projects']))
def get_project(self, project_name):
"""
Get a specific project by project_name
Expand All @@ -100,9 +101,10 @@ def get_project(self, project_name):
"""

projects_page = reqs.get(PROJECT_URL, cookies=self._cookie)

json_content = json.loads(
BeautifulSoup(projects_page.content, 'html.parser').find('meta', {'name': 'ol-projects'}).get('content'))
return next(OverleafClient.filter_projects(json_content, {"name": project_name}), None)
BeautifulSoup(projects_page.content, 'html.parser').find("meta", {"content": re.compile('\{.*"projects".*\}')}).get('content'))
return next(OverleafClient.filter_projects(json_content['projects'], {"name": project_name}), None)

def download_project(self, project_id):
"""
Expand Down Expand Up @@ -208,6 +210,8 @@ def upload_file(self, project_id, project_infos, file_name, file_size, file):
# The file name contains path separators, check folders
if PATH_SEP in file_name:
local_folders = file_name.split(PATH_SEP)[:-1] # Remove last item since this is the file name
file_name = file_name.split(PATH_SEP)[-1]

current_overleaf_folder = project_infos['rootFolder'][0]['folders'] # Set the current remote folder

for local_folder in local_folders:
Expand All @@ -225,21 +229,31 @@ def upload_file(self, project_id, project_infos, file_name, file_size, file):
current_overleaf_folder.append(new_folder)
folder_id = new_folder['_id']
current_overleaf_folder = new_folder['folders']
headers = {
"X-Csrf-Token": self._csrf
}
params = {
"folder_id": folder_id,
"_csrf": self._csrf,
"qquuid": str(uuid.uuid4()),
"qqfilename": file_name,
"qqtotalfilesize": file_size,
# "_csrf": self._csrf,
# "qquuid": str(uuid.uuid4()),
# "qqfilename": file_name,
# "qqtotalfilesize": file_size,
}
form_data = {
# "relativePath" : "null",
# "type": "application/octet-stream",
"name": file_name,
}
files = {
"qqfile": file
}

# Upload the file to the predefined folder
r = reqs.post(UPLOAD_URL.format(project_id), cookies=self._cookie, params=params, files=files)

return r.status_code == str(200) and json.loads(r.content)["success"]
r = reqs.post(UPLOAD_URL.format(project_id), cookies=self._cookie,
headers=headers, params=params, data=form_data, files=files)

# return json.loads(r.content), r.status_code
return r.status_code == 200 and json.loads(r.content)["success"]

def delete_file(self, project_id, project_infos, file_name):
"""
Expand All @@ -253,6 +267,7 @@ def delete_file(self, project_id, project_infos, file_name):
"""

file = None
type_ = "doc"

# The file name contains path separators, check folders
if PATH_SEP in file_name:
Expand All @@ -262,13 +277,23 @@ def delete_file(self, project_id, project_infos, file_name):
for local_folder in local_folders:
for remote_folder in current_overleaf_folder:
if local_folder.lower() == remote_folder['name'].lower():

file = next((v for v in remote_folder['docs'] if v['name'] == file_name.split(PATH_SEP)[-1]),
None)
if file is None:
file = next((v for v in remote_folder['fileRefs'] if v['name'] == file_name.split(PATH_SEP)[-1]),
None)
type_ = "file"

current_overleaf_folder = remote_folder['folders']
break
# File is in root folder
else:
file = next((v for v in project_infos['rootFolder'][0]['docs'] if v['name'] == file_name), None)
if file is None:
file = next((v for v in project_infos['rootFolder'][0]['fileRefs'] if v['name'] == file_name.split(PATH_SEP)[-1]),
None)
type_ = "file"

# File not found!
if file is None:
Expand All @@ -278,9 +303,11 @@ def delete_file(self, project_id, project_infos, file_name):
"X-Csrf-Token": self._csrf
}

r = reqs.delete(DELETE_URL.format(project_id, file['_id']), cookies=self._cookie, headers=headers, json={})
r = reqs.delete(DELETE_URL.format(project_id, type_, file['_id']),
cookies=self._cookie, headers=headers, json={})

return r.status_code == str(204)
# return r.content, r.status_code
return r.status_code == (204)

def download_pdf(self, project_id):
"""
Expand Down