maryna7679 commited on
Commit
6ae9b17
·
1 Parent(s): 5910954
Files changed (2) hide show
  1. Functions/video_player_functions.py +6 -4
  2. app.py +12 -5
Functions/video_player_functions.py CHANGED
@@ -27,10 +27,12 @@ def get_video_embed_by_id(video_id):
27
 
28
  def get_video_link_by_pointer(pointer):
29
  video = default_app.database().child("videos").child(str(pointer)).get().val()
30
- while video["complete"]:
31
- pointer += 1
32
- video = default_app.database().child("videos").child(str(pointer)).get().val()
33
- return video["url"], pointer
 
 
34
 
35
 
36
  def change_video_completion_status(is_complete, video_pointer):
 
27
 
28
  def get_video_link_by_pointer(pointer):
29
  video = default_app.database().child("videos").child(str(pointer)).get().val()
30
+ if video["complete"]:
31
+ return None
32
+ # while video["complete"]:
33
+ # pointer += 1
34
+ # video = default_app.database().child("videos").child(str(pointer)).get().val()
35
+ return video["url"]
36
 
37
 
38
  def change_video_completion_status(is_complete, video_pointer):
app.py CHANGED
@@ -8,6 +8,8 @@ from Resources.localization import get_string
8
 
9
  next_video_pointer = 0
10
  user = "anonymous_user"
 
 
11
 
12
 
13
  def get_username(profile: gr.OAuthProfile):
@@ -106,11 +108,17 @@ def change_completion_status(completion_status):
106
 
107
  def get_next_components():
108
  global next_video_pointer
109
- next_video_link, link_pointer = get_video_link_by_pointer(next_video_pointer)
110
- next_video_pointer = link_pointer + 1
 
 
 
 
 
 
111
  if next_video_link is None:
112
- next_video_link, link_pointer = get_video_link_by_pointer(0)
113
- next_video_pointer = link_pointer + 1
114
 
115
  try:
116
  next_video_id = youtube_link_to_id(next_video_link)
@@ -161,7 +169,6 @@ with gr.Blocks(css=css, head=yt_init_js, fill_width=True) as main_page:
161
  )
162
  add_entry_button = gr.Button(get_string("add_entry_button"), variant="secondary")
163
  editing_complete_checkbox = gr.Checkbox(label=get_string("editing_complete_checkbox"))
164
- gr.Markdown(value=f"{next_video_pointer}")
165
 
166
  with gr.Row():
167
  with gr.Group(visible=False) as editing_panel:
 
8
 
9
  next_video_pointer = 0
10
  user = "anonymous_user"
11
+ n_videos = 20
12
+ placeholder_link = "https://www.youtube.com/watch?v=1pXUgdCnVec"
13
 
14
 
15
  def get_username(profile: gr.OAuthProfile):
 
108
 
109
  def get_next_components():
110
  global next_video_pointer
111
+ next_video_link = get_video_link_by_pointer(next_video_pointer)
112
+ next_video_pointer = (next_video_pointer + 1) % n_videos
113
+
114
+ for i in range(n_videos):
115
+ if next_video_link is not None:
116
+ break
117
+ next_video_link = get_video_link_by_pointer(next_video_pointer)
118
+ next_video_pointer = (next_video_pointer + 1) % n_videos
119
  if next_video_link is None:
120
+ next_video_link = placeholder_link
121
+ next_video_pointer = -1
122
 
123
  try:
124
  next_video_id = youtube_link_to_id(next_video_link)
 
169
  )
170
  add_entry_button = gr.Button(get_string("add_entry_button"), variant="secondary")
171
  editing_complete_checkbox = gr.Checkbox(label=get_string("editing_complete_checkbox"))
 
172
 
173
  with gr.Row():
174
  with gr.Group(visible=False) as editing_panel: