add report

Makefile

@@ -45,7 +45,7 @@ daemon: $(DAEMON) $(UTILS)
 gui: $(GUI) $(UTILS)
 	$(PYTHON) src/gui.py -d
 
-pkg: dist/ActivityTracker dist/ActivityTrackerd $(PKGS_UTILS) 
+pkg: dist/activitytracker dist/activitytrackerd $(PKGS_UTILS) 
 	@echo Building Package
 
 	mkdir -p pkgs/$(PKG_NAME)/DEBIAN/

README.md

@@ -5,7 +5,8 @@
 ---
 
 ## Description
-This program helps in keep track of which windows are being opened through it's daemon process activitytrackerd and provides a gui interface to visualise those activities through activitytracker.
+Activity tracker will track time spent on various applications on a system by a user. “Activity Tracker” will help users to gain information regarding their time spent by looking into the report of the activities.
+This program keeps track of the windows which are being used through a daemon process ‘activitytrackerd’ and also provides a GUI interface to visualize those activities through activitytracker.
 For more details about the project please check the report file.
 
 ## How to run
@@ -25,7 +26,7 @@ make daemon
 This will start a daemon process in the background that will start collecting user activity data dump it in the database file `data/activity_data.db`.
 The interval at which the data is dumped into the disk can be also specified throught the makefile. E.g. to set interval to 10 Sec use command mentioned below. 
 ```bash
-make daemon interval=10
+make daemon INTERVAL=10
 ```
 Data is dumped to the databse only after an event is detected after the interval of 10 sec.
 Logs about the data being dumped into the database can be seen in `log/daemon.log`.
@@ -39,7 +40,7 @@ Logs for the gui can be seen in `log/gui.log`.
 ### Packaging Instructions
 This project can be packaged to generate a debian package os that it can be directly installed in a debian machine.
 ```bash
-make pkgs
+make pkg
 ```
 This command will generate binary executables independent of the python dependencies. It will use those binaries with various scripts needed for packaging to create a package structure.
 Finally it will create a debian package inside pkg folder `pkg/ActivityTracker_1.0_amd64.deb` using dpkg-deb.

src/dbhandler.py

@@ -57,7 +57,7 @@ class DBHandler:
         Write an entry for the amount of time an application was active in an interval.
         """
         query = f"INSERT INTO activity VALUES ({interval_start}, '{app_name}', {duration})"
-        utils.logger.log(query)
+        utils.logger.log(f"INSERT: {interval_start}, '{app_name}', {duration}")
         self.conn.execute(query)
         self.conn.commit()
 

src/start-service.sh

-#!/bin/sh
-
-DISPLAY=":1" /usr/bin/python3 /home/saswat/Projects/cs699/src/trackingdaemon.py

src/trackingdaemon.py

@@ -202,7 +202,7 @@ if __name__ == '__main__':
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
     utils.logger.is_debug = DEBUG
-    utils.logger.log(f"Current deamon pid: {os.getpid()}")
+    utils.logger.log(f"Current daemon pid: {os.getpid()}")
 
     event_handler = init_eventhandler()
     event_fetcher = EventFetcher()