Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master #97

Merged
merged 40 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
95fa970
fixed patch notes typo
Arne-Weber May 25, 2024
cc1d300
translation patch notes and README
Arne-Weber May 28, 2024
837abba
Translate Italiano.json via GitLocalize
Kuddus73 May 28, 2024
05b1edc
Translate Polski.json via GitLocalize
flxderdev May 28, 2024
fcbe9e1
Translate Polski.json via GitLocalize
rvpv May 28, 2024
ebd18e2
Translate Türkçe.json via GitLocalize
DogancanYr May 28, 2024
66e34f6
Translate Українська.json via GitLocalize
Nollasko May 28, 2024
22300ca
Translate العربية.json via GitLocalize
5wi5wi May 30, 2024
53a0e2b
Translate Türkçe.json via GitLocalize
DogancanYr May 30, 2024
19badbf
Translate 简体中文.json via GitLocalize
Suz1e May 30, 2024
6cf6fc7
udpated README and patch notes
Arne-Weber May 30, 2024
53292fa
Merge branch 'in-dev' of https://github.com/Windows200000/TwitchDrops…
Arne-Weber May 30, 2024
e27728a
Fixed prioritize_by_ending_soonest
Valentin-Metz May 28, 2024
f8cadec
Print logs to stdout
Valentin-Metz May 29, 2024
10988d8
Support unlinked campaigns
Valentin-Metz May 29, 2024
b9d152f
Revert "Support unlinked campaigns"
Valentin-Metz May 30, 2024
9c1b44d
updated english translation
Arne-Weber May 30, 2024
664dd22
Update العربية.json
Windows200000 May 30, 2024
35151ec
fixed patch patch_notes
Arne-Weber May 30, 2024
ffe127a
fixed translate.py to match English.json
Arne-Weber May 30, 2024
ea067ff
moved default translation from .py to .json
Arne-Weber May 31, 2024
d7caa46
added dark theme to dypeddict
Arne-Weber May 31, 2024
0cdd507
removed writing English.json & using DEFAULT_LANG
Arne-Weber May 31, 2024
06483b6
updated patch notes
Arne-Weber May 31, 2024
67a5dfc
pyinstaller
Arne-Weber May 31, 2024
5da42c1
testing why English.json isn't included in build
Arne-Weber May 31, 2024
0b8d857
reverted last commit
Arne-Weber May 31, 2024
e79c1eb
reverted default translation for now
Arne-Weber May 31, 2024
7721732
Moving default translation to English.json, again
Arne-Weber May 31, 2024
e82f4d8
cleanup translate.py
Arne-Weber May 31, 2024
e00187f
Update twitch.py
KK2-5 Jun 1, 2024
1c1a950
fixed tray title exceeding 128 causing crash
Arne-Weber Jun 1, 2024
9cda8cb
attempt at fixing scrolling for linux
Arne-Weber Jun 1, 2024
442bf89
The scroll fix for linux didn't work
Arne-Weber Jun 1, 2024
6fa5e7f
removed debug print statements
Arne-Weber Jun 1, 2024
8d2a34c
shorter taskbar title: allows 128, but shows 127
Arne-Weber Jun 1, 2024
2115fe9
fixed comment spelling
Arne-Weber Jun 1, 2024
679e4da
changed theme logic to use if-else, not of match
Arne-Weber Jun 3, 2024
1db7ce6
remove unnecessary can_earn_within_next_hour()
Arne-Weber Jun 3, 2024
87b3128
updated patch notes for next release
Arne-Weber Jun 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,4 @@ if they aren't already there. Doing so ensures proper markdown rendering on Gith
@Bamboozul - For the entirety of the Arabic (العربية) translation.
@Kjerne - For the entirety of the Danish (Dansk) translation.

For updating Translations: @Kuddus73, @VSeryi, @Windows200000, @BreakshadowCN, @kilroy98, @zelda0079, @Calvineries, @VSeryi, @notNSANE, @ElvisDesigns, @DogancanYr, @Nollasko
For updating Translations: @Kuddus73, @VSeryi, @Windows200000, @BreakshadowCN, @kilroy98, @zelda0079, @Calvineries, @notNSANE, @ElvisDesigns, @DogancanYr, @Nollasko, @rvpv, @flxderdev, @5wi5wi, @fgr1178707QQ, @Suz1e, @Patriot99
3 changes: 1 addition & 2 deletions build.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ to_add: list[tuple[Path, str, bool]] = [
(Path(SITE_PACKAGES_PATH, "seleniumwire/ca.key"), "./seleniumwire", False),
]
for lang_filepath in WORKING_DIR.joinpath("lang").glob("*.json"):
if lang_filepath.stem != DEFAULT_LANG:
to_add.append((lang_filepath, "lang", True))
to_add.append((lang_filepath, "lang", True))

# ensure the required to-be-added data exists
datas: list[tuple[Path, str]] = []
Expand Down
211 changes: 116 additions & 95 deletions gui.py

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,3 @@ def can_earn_within(self, stamp: datetime) -> bool:
and self.starts_at < stamp
and any(drop.can_earn_within(stamp) for drop in self.drops)
)

def can_earn_within_next_hour(self):
next_hour = datetime.now(timezone.utc) + timedelta(hours=1)
return self.can_earn_within(next_hour)
2 changes: 1 addition & 1 deletion lang/Deutsch.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"tray": "Autostart ins System Tray: ",
"tray_notifications": "System Tray Benachrichtigungen:",
"priority_only": "Nur Priorität: ",
"prioritze_end": "Kampagnen nach Ende priorisieren: ",
"prioritize_by_ending_soonest": "Kampagnen nach Ende priorisieren: ",
"proxy": "Proxy (Erfordert Neustart):"
},
"game_name": "Spiel",
Expand Down
8 changes: 4 additions & 4 deletions lang/English.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"startup": "Opening Chrome...",
"login_to_complete": "Complete the login procedure manually by pressing the Login button again.",
"no_token": "No authorization token could be found.",
"closed_window": "Chrome window was closed before the login procedure could complete."
"closed_window": "The Chrome window was closed before the login procedure could be completed."
},
"error_code": "Login error code: {error_code}",
"incorrect_login_pass": "Incorrect username or password.",
Expand Down Expand Up @@ -140,7 +140,7 @@
"tray": "Autostart into tray: ",
"tray_notifications": "Tray notifications: ",
"priority_only": "Priority Only: ",
"prioritze_end": "Prioritize by ending soonest: ",
"prioritize_by_ending_soonest": "Prioritize by ending soonest: ",
"proxy": "Proxy (requires restart):"
},
"game_name": "Game name",
Expand All @@ -156,9 +156,9 @@
"campaigns": "See all campaigns and manage account links"
},
"how_it_works": "How It Works",
"how_it_works_text": "Every ~20 seconds, the application asks Twitch for a URL to the raw stream data of the channel currently being watched. It then fetches the metadata of this data stream - this is enough to advance the drops. Note that this completely bypasses the need to download any actual stream video and sound. To keep the status (ONLINE or OFFLINE) of the channels up-to-date, there's a websocket connection estabilished that receives events about streams going up or down, or updates regarding the current amount of viewers.",
"how_it_works_text": "Every ~20 seconds, the application asks Twitch for a URL to the raw stream data of the channel currently being watched. It then fetches the metadata of this data stream - this is enough to advance the drops. Note that this completely bypasses the need to download any actual stream video and sound. To keep the status (ONLINE or OFFLINE) of the channels up-to-date, there's a websocket connection established that receives events about streams going up or down, or updates regarding the current number of viewers.",
"getting_started": "Getting Started",
"getting_started_text": "1. Login into the application.\n2. Ensure your Twitch account is linked to all campaigns you're interested in mining.\n3. If you're interested in just mining everything, uncheck \"Priority only\" and press on \"Reload\".\n4. If you want to mine specific games first, use the \"Priority\" list to setup an ordered list of games of your choice. Games from the top of the list will be attempted to be mined first, before the ones lower down the list.\n5. Keep the \"Priority only\" option checked, to avoid mining games that are not on the priority list. Or not - it's up to you.\n6. Use the \"Exclude\" list to tell the application which games should never be mined.\n7. Changing the contents of either of the lists, or changing the state of the \"Priority only\" option, requires you to press on \"Reload\" for the changes to take an effect."
"getting_started_text": "1. Log in to the application.\n2. Ensure your Twitch account is linked to all campaigns you're interested in mining.\n3. If you're interested in just mining everything, uncheck \"Priority only\" and press \"Reload\".\n4. If you want to mine specific games first, use the \"Priority\" list to set up an ordered list of games of your choice. Games from the top of the list will be attempted to be mined first, before the ones lower down the list.\n5. Keep the \"Priority only\" option checked to avoid mining games that are not on the priority list. Or not - it's up to you.\n6. Use the \"Exclude\" list to tell the application which games should never be mined.\n7. Changing the contents of either of the lists or changing the state of the \"Priority only\" option, requires you to press \"Reload\" for the changes to take effect."
}
}
}
2 changes: 1 addition & 1 deletion lang/Español.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"tray": "Ejecutar en la bandeja del sistema: ",
"tray_notifications": "Mostrar notificaciones: ",
"priority_only": "Minar solo juegos preferidos: ",
"prioritze_end": "Priorizar campañas por fecha de finalización: ",
"prioritize_by_ending_soonest": "Priorizar campañas por fecha de finalización: ",
"proxy": "Proxy (requiere reinicio):"
},
"game_name": "Nombre del juego",
Expand Down
Loading
Loading