Skip to content

Commit

Permalink
static app
Browse files Browse the repository at this point in the history
  • Loading branch information
sebge2emasphere committed May 19, 2020
1 parent 7984461 commit 541373b
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 41 deletions.
14 changes: 7 additions & 7 deletions src/kiss/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

import click

from src.kiss.clockify_api import ClockifyApi
from src.kiss.time_entries_checker import TimeEntriesChecker, TimeEntriesCheckOption
from src.kiss.time_entries_diff import TimeEntriesDiffComputer
from src.kiss.time_entries_file import TimeEntriesFile, Month, Task, DateInterval
from src.kiss.time_entries_generator import TimeEntriesGenerator
from src.kiss.time_entries_reporter import TimeEntriesReporter
from src.kiss.user_settings import UserSettings
from kiss.clockify_api import ClockifyApi
from kiss.time_entries_checker import TimeEntriesChecker, TimeEntriesCheckOption
from kiss.time_entries_diff import TimeEntriesDiffComputer
from kiss.time_entries_file import TimeEntriesFile, Month, Task, DateInterval
from kiss.time_entries_generator import TimeEntriesGenerator
from kiss.time_entries_reporter import TimeEntriesReporter
from kiss.user_settings import UserSettings

VERBOSE = False

Expand Down
4 changes: 2 additions & 2 deletions src/kiss/clockify_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import requests

from src.kiss.clockify_model import ClockifyWorkspace, ClockifyProject, ClockifyTimeEntry, ClockifyTask, ClockifyUser, \
from kiss.clockify_model import ClockifyWorkspace, ClockifyProject, ClockifyTimeEntry, ClockifyTask, ClockifyUser, \
ClockifyTag, ClockifyTimeNewEntry
from src.kiss.user_settings import UserSettings
from kiss.user_settings import UserSettings

ENDPOINT = "https://api.clockify.me/api/v1/"

Expand Down
4 changes: 2 additions & 2 deletions src/kiss/clockify_model.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import List

from src.kiss.time_entries_file import DateTimeInterval
from src.kiss.utils import from_z_datetime_to_local, parse_z_datetime
from kiss.time_entries_file import DateTimeInterval
from kiss.utils import from_z_datetime_to_local, parse_z_datetime


class ClockifyTimeInterval:
Expand Down
8 changes: 4 additions & 4 deletions src/kiss/time_entries_checker.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from datetime import date
from typing import List

from src.kiss.time_entries_diff import DaysTimeEntriesDiff, TimeEntryDiff
from src.kiss.time_entries_generator import GeneratedTimeEntry
from src.kiss.user_settings import UserSettings
from src.kiss.utils import from_seconds_to_hours
from kiss.time_entries_diff import DaysTimeEntriesDiff, TimeEntryDiff
from kiss.time_entries_generator import GeneratedTimeEntry
from kiss.user_settings import UserSettings
from kiss.utils import from_seconds_to_hours


class TimeEntriesCheckOption:
Expand Down
12 changes: 6 additions & 6 deletions src/kiss/time_entries_diff.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from datetime import time
from typing import List

from src.kiss.clockify_api import ClockifyApi
from src.kiss.clockify_model import ClockifyTimeEntry
from src.kiss.time_entries_file import DateTimeInterval
from src.kiss.time_entries_generator import GeneratedDaysTimeEntries, GeneratedDayTimeEntries, GeneratedTimeEntry
from src.kiss.user_settings import UserSettings
from src.kiss.utils import from_datetime_to_zulu_string, set_date_at_time
from kiss.clockify_api import ClockifyApi
from kiss.clockify_model import ClockifyTimeEntry
from kiss.time_entries_file import DateTimeInterval
from kiss.time_entries_generator import GeneratedDaysTimeEntries, GeneratedDayTimeEntries, GeneratedTimeEntry
from kiss.user_settings import UserSettings
from kiss.utils import from_datetime_to_zulu_string, set_date_at_time


class TimeEntryDiff:
Expand Down
2 changes: 1 addition & 1 deletion src/kiss/time_entries_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from datetime import datetime
from typing import List

from src.kiss.utils import from_datetime_to_user, parse_user_date, parse_user_datetime
from kiss.utils import from_datetime_to_user, parse_user_date, parse_user_datetime


class Month:
Expand Down
12 changes: 6 additions & 6 deletions src/kiss/time_entries_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
from datetime import date, timedelta, datetime, time
from typing import List

from src.kiss.clockify_api import ClockifyApi
from src.kiss.clockify_model import ClockifyTimeNewEntry, ClockifyTimeInterval
from src.kiss.time_entries_file import TimeEntriesFile, DateTimeInterval, DateInterval
from src.kiss.user_settings import DaySettings
from src.kiss.user_settings import UserSettings
from src.kiss.utils import from_datetime_to_zulu_string, set_date_at_time, get_duration_in_secs
from kiss.clockify_api import ClockifyApi
from kiss.clockify_model import ClockifyTimeNewEntry, ClockifyTimeInterval
from kiss.time_entries_file import TimeEntriesFile, DateTimeInterval, DateInterval
from kiss.user_settings import DaySettings
from kiss.user_settings import UserSettings
from kiss.utils import from_datetime_to_zulu_string, set_date_at_time, get_duration_in_secs


class GeneratedTimeEntry:
Expand Down
25 changes: 13 additions & 12 deletions src/kiss/time_entries_reporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import sys
from typing import List

from src.kiss.clockify_api import ClockifyApi
from src.kiss.time_entries_checker import TimeEntriesCheckReport
from src.kiss.time_entries_diff import DaysTimeEntriesDiff, DayTimeEntriesDiff, TimeEntryDiff
from src.kiss.time_entries_file import DateTimeInterval
from src.kiss.user_settings import UserSettings
from src.kiss.utils import RESET_FORMAT, COLOR_YELLOW, COLOR_RED, COLOR_GREEN, BOLD, from_seconds_to_hours, from_seconds_to_days
from kiss.clockify_api import ClockifyApi
from kiss.time_entries_checker import TimeEntriesCheckReport
from kiss.time_entries_diff import DaysTimeEntriesDiff, DayTimeEntriesDiff, TimeEntryDiff
from kiss.time_entries_file import DateTimeInterval
from kiss.user_settings import UserSettings
from kiss.utils import RESET_FORMAT, COLOR_YELLOW, COLOR_RED, COLOR_GREEN, BOLD, from_seconds_to_hours, from_seconds_to_days


class TimeEntriesReporter:
Expand All @@ -21,10 +21,13 @@ def __init__(self, api: ClockifyApi, user_settings: UserSettings):
def create_report(self, time_entries_diff: DaysTimeEntriesDiff, report: TimeEntriesCheckReport) -> str:
concatenated = []

with open(self.get_logo_file()) as logo_file:
concatenated.append(logo_file.read())
try:
with open(self.get_logo_file()) as logo_file:
concatenated.append(logo_file.read())
concatenated.append('\n\n')
except IOError as e:
concatenated.append('')

concatenated.append('\n\n')
concatenated.append(self.create_days_report(time_entries_diff, report))
concatenated.append('\n\n')

Expand All @@ -49,11 +52,9 @@ def create_report(self, time_entries_diff: DaysTimeEntriesDiff, report: TimeEntr
return ''.join(concatenated)

def get_logo_file(self):
if getattr(sys, 'frozen', False):
print('frozen false')
if getattr(sys, 'frozen', True):
return f'{os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__)))}/logo.txt'
else:
print('frozen true')
return 'kiss/logo.txt'

def create_days_report(self, time_entries_diff: DaysTimeEntriesDiff, report: TimeEntriesCheckReport) -> str:
Expand Down
2 changes: 1 addition & 1 deletion src/kiss/user_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from datetime import time, timedelta, datetime, date
from typing import List

from src.kiss.utils import parse_user_time
from kiss.utils import parse_user_time


class TaskSettings:
Expand Down

0 comments on commit 541373b

Please sign in to comment.