Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1eb51a6
update readme
skylarscorca Mar 22, 2023
d9eef17
deleted TODO, changed makefile
skylarscorca Mar 22, 2023
8909ab9
change makefile
skylarscorca Mar 22, 2023
dc8334a
fixed comments and added a few notes in the commends
skylarscorca Apr 21, 2023
4c08df6
Initial server & client set up | Transfer a file between server and c…
jdewey2023 Apr 22, 2023
ccd3106
cleaned up code
skylarscorca Apr 22, 2023
312aa8c
added comments
skylarscorca Apr 22, 2023
69eaef4
fixed makefile and readme, copies test to transfer using get command
skylarscorca Apr 22, 2023
7d2b6e1
Merge pull request #1 from skylarscorca/jack
skylarscorca Apr 22, 2023
a29e0bd
remove transfer file
skylarscorca Apr 22, 2023
9edaa48
open editor after file transfer
skylarscorca Apr 22, 2023
bef2304
update readme
skylarscorca Apr 23, 2023
b9aa87a
Update README.md
skylarscorca Apr 23, 2023
3872c62
started adding message sending on client side
skylarscorca Apr 23, 2023
2ad8a16
send update messages to server
skylarscorca Apr 23, 2023
7424029
moved where we close serverFd, cleaned up code
skylarscorca Apr 23, 2023
f9b6f20
moved ir to the right place
skylarscorca Apr 23, 2023
b1b2bcc
Initialize text editor with file from server and clear screen after c…
jdewey2023 Apr 23, 2023
0a1c7f8
Port in command line arguments for server
jdewey2023 Apr 23, 2023
b9217f5
kilo only needs one ctrl-q
skylarscorca Apr 23, 2023
2ebb4fc
took out save ctrl-s
skylarscorca Apr 23, 2023
9970d97
Remove temporary transfer file
jdewey2023 Apr 23, 2023
fbe2688
Merge branch 'master' of github.com:skylarscorca/cpd_term_project
jdewey2023 Apr 23, 2023
54e32a3
Starting server update client
Apr 23, 2023
6bbd23b
Merge branch 'master' of https://github.com/skylarscorca/cpd_term_pro…
Apr 23, 2023
9e1c06d
added thread function and create thread
skylarscorca Apr 23, 2023
2fa5e53
Added multiple clients and distribution of update messages
Apr 23, 2023
cbfc074
Merge pull request #2 from skylarscorca/update_client
Tonster2053 Apr 23, 2023
b0e4f48
get update command
skylarscorca Apr 23, 2023
9dbfd60
Merge pull request #3 from skylarscorca/update_client
jdewey2023 Apr 23, 2023
f12b7f1
Merge branch 'master' into tony-branch
jdewey2023 Apr 23, 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
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
all: kilo
CC = gcc -g -Wall -W -ansi -pedantic -std=c99 -pthread -o
C+ = g++ -g -Wall -pthread -std=c++11 -o

all: kilo server

kilo: kilo.c
$(CC) -o kilo kilo.c -Wall -W -pedantic -std=c99
$(CC) kilo kilo.c

server: server.cpp
$(C+) server server.cpp

clean:
rm kilo
rm -f kilo server transfer
32 changes: 31 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ A screencast is available here: https://asciinema.org/a/90r2i9bq8po03nazhqtsifks

Usage: kilo `<filename>`

Keys:
New Usage: kilo `<host>` `<port>`

'get' to copy file from server

Editor Keys:

CTRL-S: Save
CTRL-Q: Quit
Expand All @@ -24,3 +28,29 @@ style CLI.

Kilo was written by Salvatore Sanfilippo aka antirez and is released
under the BSD 2 clause license.

# cpd-term-project
Term Project for COP5570
Concurrent Text File Editing (Google Docs redev)

Contributers:
Skylar Scorca,
Tony Drouillard,
Jack Dewey

Project Objectives (intended features)
- Allow users to update a single text file simultaneously
- Allow users to view the updates of other users in real-time
- Handle the movement of a user’s cursor after an update is made
- Handle transactions quickly and efficiently

Optional Objectives: (if time allows)
- Allow users to create and delete text files in a greater system of files
- Allow users to modify the tree structure of the greater system of files
- Allow users to view the updates to the file system in real-time

Due date countdown:
https://www.timeanddate.com/countdown/generic?iso=20230428T2359&p0=856&msg=cpd+term+project+due+date&font=cursive&csz=1

Google Drive Folder:
https://drive.google.com/drive/folders/1sZ5ulUizpBA6Rq9KOYdHxhaF4QC_5UAi?usp=share_link
10 changes: 0 additions & 10 deletions TODO

This file was deleted.

Loading