Skip to content

Commit ba02237

Browse files
Stake2Stake2
committed
Re-updated to fix wrong commit
1 parent 807888a commit ba02237

File tree

10 files changed

+1956
-76
lines changed

10 files changed

+1956
-76
lines changed

‎Module Files/Food_Time/Times.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"Will be hungry": 3
1111
},
1212
"Ate": {
13-
"Object": "2023-05-11 19:39:19-03:00",
13+
"Object": "2023-05-22 13:19:38-03:00",
1414
"Time": 0,
15-
"Time text": "19:39",
15+
"Time text": "13:19",
1616
"Unit": {
1717
"en": "hours",
1818
"pt": "horas"
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
"Can drink water": {
26-
"Object": "2023-05-11 20:19:19-03:00",
26+
"Object": "2023-05-22 13:59:38-03:00",
2727
"Time": 40,
28-
"Time text": "20:19",
28+
"Time text": "13:59",
2929
"Unit": {
3030
"en": "minutes",
3131
"pt": "minutos"
@@ -36,9 +36,9 @@
3636
}
3737
},
3838
"Will be hungry": {
39-
"Object": "2023-05-11 22:39:19-03:00",
39+
"Object": "2023-05-22 16:19:38-03:00",
4040
"Time": 3,
41-
"Time text": "22:39",
41+
"Time text": "16:19",
4242
"Unit": {
4343
"en": "hours",
4444
"pt": "horas"

‎Modules/GamePlayer/Manage/Add_A_New_Game/__init__.py

+72-57
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,36 @@ def Type_Game_Information(self):
4343
print(self.language_texts["type_the_game_information_(some_items_can_be_left_empty_by_pressing_enter)"] + ":")
4444

4545
# Ask for the game titles
46-
if self.switches["testing"] == False:
47-
title = self.Input.Type(self.JSON.Language.language_texts["original_title"], next_line = True, accept_enter = False)
46+
if "Original" not in self.game["Titles"]:
47+
if self.switches["testing"] == False:
48+
title = self.Input.Type(self.JSON.Language.language_texts["original_title"], next_line = True, accept_enter = False)
4849

49-
if self.switches["testing"] == True:
50-
title = self.JSON.Language.language_texts["title, title()"] + " (" + self.dictionary["Type"]["Type"][self.user_language] + ")"
50+
if self.switches["testing"] == True:
51+
title = self.JSON.Language.language_texts["title, title()"] + " (" + self.dictionary["Type"]["Type"][self.user_language] + ")"
5152

52-
if self.game["Title"] == "":
53-
self.game["Title"] = title
53+
if self.game["Title"] == "":
54+
self.game["Title"] = title
5455

55-
self.game["Titles"]["Original"] = self.game["Title"]
56+
self.game["Titles"]["Original"] = self.game["Title"]
5657

57-
for language in self.languages["small"]:
58-
translated_language = self.languages["full_translated"][language][self.user_language]
58+
for language in self.languages["small"]:
59+
translated_language = self.languages["full_translated"][language][self.user_language]
5960

60-
title = ""
61+
title = ""
6162

62-
if self.switches["testing"] == False:
63-
title = self.Input.Type(self.JSON.Language.language_texts["title_in_{}"].format(translated_language), next_line = True)
63+
if self.switches["testing"] == False:
64+
title = self.Input.Type(self.JSON.Language.language_texts["title_in_{}"].format(translated_language), next_line = True)
6465

65-
if title != "":
66-
self.game["Titles"][language] = title
66+
if title != "":
67+
self.game["Titles"][language] = title
6768

68-
title = ""
69+
title = ""
6970

70-
if self.switches["testing"] == False:
71-
title = self.Input.Type(self.JSON.Language.language_texts["romanized_title"], next_line = True)
71+
if self.switches["testing"] == False:
72+
title = self.Input.Type(self.JSON.Language.language_texts["romanized_title"], next_line = True)
7273

73-
if title != "":
74-
self.game["Titles"]["Romanized"] = title
74+
if title != "":
75+
self.game["Titles"]["Romanized"] = title
7576

7677
# Ask for the game year and dates
7778
text = self.Date.language_texts["year, title()"] + " (" + self.JSON.Language.language_texts["format"] + ": " + str(self.Date.Now()["Units"]["Year"]) + ")"
@@ -108,61 +109,74 @@ def Type_Game_Information(self):
108109
self.game[date_type.title() + " date"] = date
109110

110111
# Ask for the original language of the game
111-
show_text = self.JSON.Language.language_texts["languages, title()"]
112-
select_text = self.JSON.Language.language_texts["language, title()"]
112+
self.game["Language"] = "[" + self.JSON.Language.language_texts["empty, title()"] + "]"
113113

114-
languages = list(self.languages["full"].values())
115-
languages.append("[" + self.JSON.Language.language_texts["empty, title()"] + "]")
114+
if "Update" not in self.dictionary:
115+
show_text = self.JSON.Language.language_texts["languages, title()"]
116+
select_text = self.JSON.Language.language_texts["language, title()"]
116117

117-
if self.switches["testing"] == False:
118-
language = self.Input.Select(show_text = show_text, select_text = select_text, options = languages)["option"]
118+
languages = list(self.languages["full"].values())
119+
languages.append("[" + self.JSON.Language.language_texts["empty, title()"] + "]")
119120

120-
if self.switches["testing"] == True:
121-
language = "[" + self.JSON.Language.language_texts["empty, title()"] + "]"
121+
if self.switches["testing"] == False:
122+
language = self.Input.Select(show_text = show_text, select_text = select_text, options = languages)["option"]
122123

123-
if language != "[" + self.JSON.Language.language_texts["empty, title()"] + "]":
124-
self.game["Language"] = language
124+
if self.switches["testing"] == True:
125+
language = "[" + self.JSON.Language.language_texts["empty, title()"] + "]"
125126

126-
# Ask for the game platform
127-
show_text = self.JSON.Language.language_texts["platforms, title()"]
128-
select_text = self.JSON.Language.language_texts["platform, title()"]
127+
if language != "[" + self.JSON.Language.language_texts["empty, title()"] + "]":
128+
self.game["Language"] = language
129129

130-
if self.switches["testing"] == False:
131-
platform = self.Input.Select(show_text = show_text, select_text = select_text, options = self.game_types["Platforms"][self.user_language])["option"]
130+
# Ask for the game platform
131+
show_text = self.JSON.Language.language_texts["platforms, title()"]
132+
select_text = self.JSON.Language.language_texts["platform, title()"]
132133

133-
if self.switches["testing"] == True:
134-
platform = self.game_types["Platforms"][self.user_language][0]
134+
if self.switches["testing"] == False:
135+
platform = self.Input.Select(show_text = show_text, select_text = select_text, options = self.game_types["Platforms"][self.user_language])["option"]
135136

136-
if "Platform" not in self.game:
137-
self.game["Platform"] = platform
137+
if self.switches["testing"] == True:
138+
platform = self.game_types["Platforms"][self.user_language][0]
139+
140+
if "Platform" not in self.game:
141+
self.game["Platform"] = platform
138142

139143
# Ask for the game developers, publishers, and distributors
140144
for key in ["developers", "publishers", "distributors"]:
141145
text = self.JSON.Language.language_texts[key + ", title()"]
142146

143147
if self.switches["testing"] == False:
144-
self.game[key.capitalize()] = self.Input.Type(text + ":", next_line = True, accept_enter = False)
148+
accept_enter = False
149+
150+
if key == "publishers":
151+
accept_enter = True
152+
153+
self.game[key.capitalize()] = self.Input.Type(text + ":", next_line = True, accept_enter = accept_enter)
154+
155+
if self.game[key.capitalize()] == "":
156+
self.game.pop(key.capitalize())
145157

146158
if self.switches["testing"] == True:
147159
self.game[key.capitalize()] = text
148160

149161
# Ask for the game status
150-
show_text = self.JSON.Language.language_texts["statuses, title()"]
151-
select_text = self.JSON.Language.language_texts["status, title()"]
162+
if "Update" not in self.dictionary:
163+
show_text = self.JSON.Language.language_texts["statuses, title()"]
164+
select_text = self.JSON.Language.language_texts["status, title()"]
152165

153-
if self.switches["testing"] == False:
154-
status = self.Input.Select(show_text = show_text, select_text = select_text, options = self.language_texts["statuses, type: list"])["option"]
166+
if self.switches["testing"] == False:
167+
status = self.Input.Select(show_text = show_text, select_text = select_text, options = self.language_texts["statuses, type: list"])["option"]
155168

156-
if self.switches["testing"] == True:
157-
status = self.language_texts["statuses, type: list"][0]
169+
if self.switches["testing"] == True:
170+
status = self.language_texts["statuses, type: list"][0]
158171

159-
if "Status" not in self.game:
160-
self.game["Status"] = status
172+
if "Status" not in self.game:
173+
self.game["Status"] = status
161174

162175
def Create_Details(self):
163-
self.game["Details"] = {
164-
self.JSON.Language.language_texts["title, title()"]: self.game["Title"]
165-
}
176+
if "Details" not in self.game:
177+
self.game["Details"] = {
178+
self.JSON.Language.language_texts["title, title()"]: self.game["Title"]
179+
}
166180

167181
for language in self.languages["small"]:
168182
translated_language = self.languages["full_translated"][language][self.user_language]
@@ -185,27 +199,28 @@ def Create_Details(self):
185199
if "End date" in self.game:
186200
self.game["Details"][self.Date.language_texts["end_date"]] = self.game["End date"]
187201

188-
if "Language" in self.game:
202+
if "Update" not in self.dictionary and "Language" in self.game and self.game["Language"] != "[" + self.JSON.Language.language_texts["empty, title()"] + "]":
189203
self.game["Details"][self.JSON.Language.language_texts["original_language"]] = self.game["Language"]
190204

191205
self.game["Details"][self.JSON.Language.language_texts["platform, title()"]] = self.game["Platform"][self.user_language]
192206

193207
for key in ["developers", "publishers", "distributors"]:
194208
text_key = key
195209

196-
if ", " not in self.game[key.capitalize()]:
197-
text_key = text_key[:-1]
210+
if key.capitalize() in self.game:
211+
if ", " not in self.game[key.capitalize()]:
212+
text_key = text_key[:-1]
198213

199-
text_key = self.JSON.Language.language_texts[text_key + ", title()"]
214+
text_key = self.JSON.Language.language_texts[text_key + ", title()"]
200215

201-
self.game["Details"][text_key] = self.game[key.capitalize()]
216+
self.game["Details"][text_key] = self.game[key.capitalize()]
202217

203-
if self.game["Status"] != self.JSON.Language.language_texts["remote, title()"]:
218+
if "Status" in self.game:
204219
self.game["Details"][self.JSON.Language.language_texts["status, title()"]] = self.game["Status"]
205220

206221
# Create the game folders
207222
self.game["folders"] = {
208-
"root": self.dictionary["Type"]["Folders"]["information"]["root"] + self.Sanitize(self.game["Title"], restricted_characters = True) + "/"
223+
"root": self.dictionary["Type"]["Folders"]["information"]["root"] + self.Sanitize_Title(self.game["Title"]) + "/"
209224
}
210225

211226
self.Folder.Create(self.game["folders"]["root"])

‎Modules/GamePlayer/Manage/Iterate_Through_The_Game_List/__init__.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ def __init__(self):
5151
self.Show_Information(self.dictionary)
5252

5353
# Add missing game information
54-
self.Add_Game_Information()
54+
if self.Date.language_texts["year, title()"] not in self.game["Details"]:
55+
self.Add_Game_Information()
5556

5657
if self.switches["testing"] == True and game_type != self.game_types["Types"]["en"][-1] and game_type not in game_types_to_remove:
5758
self.Input.Type(self.JSON.Language.language_texts["continue, title()"])
@@ -66,6 +67,12 @@ def Add_Game_Information(self):
6667

6768
self.dictionary["Update"] = True
6869

70+
self.duckduckgo = {
71+
"Format": "https://duckduckgo.com/?t=ffab&q={}"
72+
}
73+
74+
self.File.Open(self.duckduckgo["Format"].format(self.game["Title"]))
75+
6976
self.Add_A_New_Game(self.dictionary)
7077

7178
def Create_Years_List(self):

‎Modules/Stories/Post/__init__.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ def __init__(self, run_as_module = False, story = None):
1818
"Create_Cover",
1919
"Update_Websites",
2020
"Post_On_Wattpad",
21-
"Post_On_Social_Networks",
21+
"Post_On_Social_Networks"
2222
]
2323

2424
# Define texts of post steps
2525
texts = [
2626
self.language_texts["cover_creation"],
2727
self.language_texts["websites_update"],
2828
self.language_texts["wattpad_chapter_posting"],
29-
self.language_texts["social_network_posting"],
29+
self.language_texts["social_network_posting"]
3030
]
3131

3232
self.post_steps_texts = {}
@@ -138,9 +138,9 @@ def Create_Cover(self):
138138
self.cover_types = {
139139
"list": [
140140
"portrait, title()",
141-
"landscape, title()",
141+
"landscape, title()"
142142
],
143-
"extension": "jpg",
143+
"extension": "jpg"
144144
}
145145

146146
list_ = []
@@ -154,7 +154,7 @@ def Create_Cover(self):
154154
"name": english_text,
155155
"title": self.language_texts[item],
156156
"extension": self.cover_types["extension"],
157-
"sony_vegas_file": self.story["folders"]["Sony Vegas Covers"] + english_text + ".veg",
157+
"sony_vegas_file": self.story["folders"]["Sony Vegas Covers"] + english_text + ".veg"
158158
}
159159

160160
list_.append(english_text)

‎Modules/Tasks/Tasks/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,12 @@ def Show_Information(self, dictionary):
315315
print("\t" + dictionary["Entry"]["Dates"]["Timezone"])
316316

317317
# If there are states, show them
318-
if "States" in task and task["States"]["States"] != {}:
318+
if "States" in dictionary and dictionary["States"]["Texts"] != {}:
319319
print()
320320
print(self.JSON.Language.language_texts["states, title()"] + ":")
321321

322-
for key in task["States"]["Texts"]:
323-
print("\t" + task["States"]["Texts"][key][self.user_language])
322+
for key in dictionary["States"]["Texts"]:
323+
print("\t" + dictionary["States"]["Texts"][key][self.user_language])
324324

325325
show_task_description = self.Input.Yes_Or_No(self.language_texts["show_task_description"] + "?" + " (" + self.language_texts["can_be_long"] + ")")
326326

‎Modules/Watch_History/Comment_Writer/__init__.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,12 @@ def Write_Comment_To_Files(self):
289289
import validators
290290

291291
while validators.url(original_link) != True:
292-
# Ask for YouTube comment link
293-
original_link = self.Input.Type(self.language_texts["paste_the_comment_link_of_youtube"])
292+
# Ask for the YouTube comment link
293+
if self.switches["testing"] == False:
294+
original_link = self.Input.Type(self.language_texts["paste_the_comment_link_of_youtube"])
295+
296+
if self.switches["testing"] == True:
297+
original_link = "https://www.youtube.com/watch?v=bbmtQkCcWY4&lc=UgxuNs35fO-gFEDY7l14AaABAg"
294298

295299
link = urlparse(original_link)
296300
query = link.query

0 commit comments

Comments
 (0)