Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
engine
Commits
fe7b6b74
Commit
fe7b6b74
authored
1 year ago
by
David Trattnig
Browse files
Options
Downloads
Patches
Plain Diff
refactor(tt): pass api fetcher in constructor
parent
c4663af5
No related branches found
No related tags found
1 merge request
!35
ORM-less scheduling
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/aura_engine/scheduling/scheduler.py
+2
-2
2 additions, 2 deletions
src/aura_engine/scheduling/scheduler.py
src/aura_engine/scheduling/timetable.py
+6
-7
6 additions, 7 deletions
src/aura_engine/scheduling/timetable.py
with
8 additions
and
9 deletions
src/aura_engine/scheduling/scheduler.py
+
2
−
2
View file @
fe7b6b74
...
@@ -243,7 +243,7 @@ class AuraScheduler(threading.Thread):
...
@@ -243,7 +243,7 @@ class AuraScheduler(threading.Thread):
"""
"""
self
.
config
=
AuraConfig
.
config
()
self
.
config
=
AuraConfig
.
config
()
self
.
logger
=
logging
.
getLogger
(
"
engine
"
)
self
.
logger
=
logging
.
getLogger
(
"
engine
"
)
self
.
timetable
=
timetable
.
TimetableService
(
self
.
config
.
get
(
"
cache_dir
"
))
self
.
timetable
=
timetable
.
TimetableService
(
self
.
config
.
get
(
"
cache_dir
"
)
,
api
.
ApiFetcher
()
)
self
.
timetable_renderer
=
utils
.
TimetableRenderer
(
self
)
self
.
timetable_renderer
=
utils
.
TimetableRenderer
(
self
)
self
.
engine
=
engine
self
.
engine
=
engine
self
.
engine
.
scheduler
=
self
self
.
engine
.
scheduler
=
self
...
@@ -285,7 +285,7 @@ class AuraScheduler(threading.Thread):
...
@@ -285,7 +285,7 @@ class AuraScheduler(threading.Thread):
self
.
logger
.
info
(
SU
.
cyan
(
msg
))
self
.
logger
.
info
(
SU
.
cyan
(
msg
))
# Load some stuff from the API in any case
# Load some stuff from the API in any case
self
.
timetable
.
refresh
(
api
.
ApiFetcher
()
)
self
.
timetable
.
refresh
()
# Queue only when the engine is ready to play
# Queue only when the engine is ready to play
if
self
.
is_initialized
:
if
self
.
is_initialized
:
...
...
This diff is collapsed.
Click to expand it.
src/aura_engine/scheduling/timetable.py
+
6
−
7
View file @
fe7b6b74
...
@@ -56,12 +56,13 @@ class TimetableService:
...
@@ -56,12 +56,13 @@ class TimetableService:
cache_location
:
str
=
None
cache_location
:
str
=
None
timetable_file
:
str
=
None
timetable_file
:
str
=
None
def
__init__
(
self
,
cache_location
:
str
):
def
__init__
(
self
,
cache_location
:
str
,
api_fetcher
:
api
.
ApiFetcher
):
"""
"""
Initialize.
Initialize.
Args:
Args:
cache_location (str): Path to folder where timetable.json is cached.
cache_location (str): Path to folder where timetable.json is cached.
api_fetcher (ApiFetcher): Service to fetch timeslots and playlists.
"""
"""
self
.
config
=
AuraConfig
.
config
()
self
.
config
=
AuraConfig
.
config
()
self
.
logger
=
logging
.
getLogger
(
"
engine
"
)
self
.
logger
=
logging
.
getLogger
(
"
engine
"
)
...
@@ -73,9 +74,10 @@ class TimetableService:
...
@@ -73,9 +74,10 @@ class TimetableService:
os
.
makedirs
(
cache_location
,
exist_ok
=
True
)
os
.
makedirs
(
cache_location
,
exist_ok
=
True
)
self
.
cache_location
=
cache_location
self
.
cache_location
=
cache_location
self
.
timetable_file
=
self
.
cache_location
+
"
/timetable.json
"
self
.
timetable_file
=
self
.
cache_location
+
"
/timetable.json
"
self
.
api_fetcher
=
api_fetcher
self
.
load_timetable
()
self
.
load_timetable
()
def
refresh
(
self
,
fetcher
:
api
.
ApiFetcher
):
def
refresh
(
self
):
"""
"""
Update the timetable.
Update the timetable.
...
@@ -83,14 +85,11 @@ class TimetableService:
...
@@ -83,14 +85,11 @@ class TimetableService:
2. Merge with the current timetable.
2. Merge with the current timetable.
3. Persist to `timetable.json`
3. Persist to `timetable.json`
Args:
fetcher (ApiFetcher): Service to fetch timeslots and playlists.
"""
"""
self
.
logger
.
debug
(
"
Trying to fetch new timeslots from API endpoints...
"
)
self
.
logger
.
debug
(
"
Trying to fetch new timeslots from API endpoints...
"
)
# Create a fetching thread and wait until it is done
# Create a fetching thread and wait until it is done
self
.
api_fetcher
=
fetcher
self
.
api_fetcher
.
start
()
fetcher
.
start
()
response
=
self
.
api_fetcher
.
fetch
()
response
=
fetcher
.
fetch
()
if
response
.
code
==
0
:
if
response
.
code
==
0
:
if
len
(
response
.
timeslots
)
>
0
:
if
len
(
response
.
timeslots
)
>
0
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment