From 0b71a4de6a84e01b1c8e5579a972c92cea8d004d Mon Sep 17 00:00:00 2001 From: Nathaniel Kenschaft Date: Tue, 16 Jun 2020 11:35:04 -0400 Subject: [PATCH] fixed git history --- bgservice/bgservice.py | 8 ++- bgservice/checker.py | 15 +++-- bgservice/test.py | 4 ++ docs/Makefile | 20 +++++++ docs/make.bat | 35 ++++++++++++ docs/source/conf.py | 55 +++++++++++++++++++ docs/source/index.rst | 20 +++++++ .../Essay1_APLit_eharris1/instruct.txt | 0 8 files changed, 148 insertions(+), 9 deletions(-) create mode 100644 bgservice/test.py create mode 100644 docs/Makefile create mode 100644 docs/make.bat create mode 100644 docs/source/conf.py create mode 100644 docs/source/index.rst create mode 100644 eharris1/APLit_eharris1/Essay1_APLit_eharris1/instruct.txt diff --git a/bgservice/bgservice.py b/bgservice/bgservice.py index 437cdda..8943172 100644 --- a/bgservice/bgservice.py +++ b/bgservice/bgservice.py @@ -92,16 +92,17 @@ def watch_dir(watched_dir="/tmp", logdir="/tmp/skooloslogs"): logfile = open( logdir + "/skoolos_" + time.strftime("%m%d%Y-%H%M%S", time.localtime()), 'w') - sys.stdout = logfile START_TIME = time.time() - print("Start time: " + - time.strftime("%A, %B %d, %Y %H:%M:%S", time.localtime()) + "\n\n") wm = pyinotify.WatchManager() mask = pyinotify.IN_CREATE | pyinotify.IN_CLOSE_WRITE | pyinotify.IN_DELETE | \ pyinotify.IN_MOVED_TO | pyinotify.IN_MOVED_FROM | pyinotify.IN_OPEN NOTIFIER = pyinotify.ThreadedNotifier(wm, EventHandler()) NOTIFIER.start() + sys.stdout = open("/dev/null", 'w') wm.add_watch(watched_dir, mask, rec=True) + sys.stdout = logfile + print("Start time: " + + time.strftime("%A, %B %d, %Y %H:%M:%S", time.localtime()) + "\n") def stop_watching(): @@ -111,6 +112,7 @@ def stop_watching(): time.strftime("%A, %B %d, %Y %H:%M:%S", time.localtime())) print("\nTotal work time: " + time.strftime("%H:%M:%S", time.gmtime(now - START_TIME))) + print("\n" + checker.shell_check()) suspicious_files = checker.file_check(DIR) if suspicious_files != []: print( diff --git a/bgservice/checker.py b/bgservice/checker.py index 78afdae..773e31a 100644 --- a/bgservice/checker.py +++ b/bgservice/checker.py @@ -75,19 +75,22 @@ def shell_check(): zsh_history = [ line.strip() for line in open(os.path.expanduser("~/.histfile"), 'r') ] - report = "Suspicios commands found:\n" + suspicious_commands = [] for i in bash_history + zsh_history: if "git" in i: - report += i + "\n" - if report != "Suspicios commands found:\n": - return report + suspicious_commands.append(i) + if suspicious_commands != []: + return str( + len(suspicious_commands) + ) + " suspicious commands found:\n" + "\n".join(suspicious_commands) return "Nothing suspicious found in bash or zsh history." def verify_file(file_): for ext in file_whitelist: - if file_[len(file_) - len(ext):] == ext: - return True + if len(file_) > len(ext): + if file_[len(file_) - len(ext):] == ext: + return True return False diff --git a/bgservice/test.py b/bgservice/test.py new file mode 100644 index 0000000..9c7cad0 --- /dev/null +++ b/bgservice/test.py @@ -0,0 +1,4 @@ +import bgservice as bg +bg.watch_dir() +input() +bg.stop_watching() diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..d0c3cbf --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = source +BUILDDIR = build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/make.bat b/docs/make.bat new file mode 100644 index 0000000..6247f7e --- /dev/null +++ b/docs/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=source +set BUILDDIR=build + +if "%1" == "" goto help + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.http://sphinx-doc.org/ + exit /b 1 +) + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd diff --git a/docs/source/conf.py b/docs/source/conf.py new file mode 100644 index 0000000..214287e --- /dev/null +++ b/docs/source/conf.py @@ -0,0 +1,55 @@ +# Configuration file for the Sphinx documentation builder. +# +# This file only contains a selection of the most common options. For a full +# list see the documentation: +# https://www.sphinx-doc.org/en/master/usage/configuration.html + +# -- Path setup -------------------------------------------------------------- + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +# +# import os +# import sys +# sys.path.insert(0, os.path.abspath('.')) + + +# -- Project information ----------------------------------------------------- + +project = 'SkoolOS' +copyright = '2020, Rushil Umaretiya, Raffu Khondaker, Nathaniel Kenschaft' +author = 'Rushil Umaretiya, Raffu Khondaker, Nathaniel Kenschaft' + +# The full version, including alpha/beta/rc tags +release = '0.0.1' + + +# -- General configuration --------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +# This pattern also affects html_static_path and html_extra_path. +exclude_patterns = [] + + +# -- Options for HTML output ------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +# +# html_theme = 'alabaster' + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] diff --git a/docs/source/index.rst b/docs/source/index.rst new file mode 100644 index 0000000..dfff865 --- /dev/null +++ b/docs/source/index.rst @@ -0,0 +1,20 @@ +.. SkoolOS documentation master file, created by + sphinx-quickstart on Tue Jun 16 11:22:02 2020. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to SkoolOS's documentation! +=================================== + +.. toctree:: + :maxdepth: 2 + :caption: Contents: + + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` diff --git a/eharris1/APLit_eharris1/Essay1_APLit_eharris1/instruct.txt b/eharris1/APLit_eharris1/Essay1_APLit_eharris1/instruct.txt new file mode 100644 index 0000000..e69de29