Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

QOL changes - #32

Open
vasilky3 wants to merge 14 commits into
fugkco:masterfrom
vasilky3:master
Open

QOL changes#32
vasilky3 wants to merge 14 commits into
fugkco:masterfrom
vasilky3:master

Conversation

@vasilky3

@vasilky3 vasilky3 commented Mar 6, 2024

Copy link
Copy Markdown
Contributor
  1. Only one thread compare to old version. Coroutines used here
  2. search trackers separately + visualisation
  3. smart search for TVSeries. Can make multiple searches for more accurate result. Can use season names. Can find seasons in ranges e.g. [2 to 8] === 4
  4. Progress bar + async trackers requesting
  5. Added extra info to TV-search requests on the elementum side. Proceed it for more accurate result e.g. show_year, season_year, ep_year.
  6. fix double prints
  7. fix resolution mises, made it less strict.

Smart filter for TV search. Works much accurate but slower, can be disabled in settings.
Works better with elgatito/elementum#86 and elgatito/elementum#87

vasilky3 and others added 9 commits December 29, 2023 23:56
Main idea is search lots of torrent using title only. Filter this data using show_year, season_year, episode_year, season, episode, absolute_episode_number,season_name.
Moreover filter looks for ranges in names e.g.: filter for ep 132 will return torrent 'Naruto [1-524]'. Same logic for years and seasons.
… only one thread.

add dialog helper to see awaited indexers and progress
rewrite client to be async
remove uninformative p_dialog loadig from socket progress (~instant)
add async request + async magnet resolve.
add more informative p_dialog
fix kodi bug with cpp-asyncio + win python 3.8-3.9 bug
add aiohttp to poetry
remove poetry request lib
add translations
small FLAKE8 warn fixes

@fugkco fugkco left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a lot of changes! Generally, mostly looks good. I'll have to test it out but won't be able to until next week or so.

Comment thread src/utils.py
Comment on lines +23 to +25
('720p', [r'720[p]', r'1280x720', r'hd720p?', r'hd\-?rip', r'b[rd]rip', r'xvid', r'dvd', r'dvdrip', r'hdtv',
r'web\-(dl)?rip', r'iptv']),
('480p', [r'480[p]', r'sat\-?rip', r'tv\-?rip']),

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any examples for these? dvd is usually 480p or less. Not 720p. I see hdtv as the only one correctly moved option (in that, hdtv should be 720p). DVD/rip/xvid doesn't feel like it should be there.

@vasilky3 vasilky3 Mar 7, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You right DVD is 480p by default. I can fit 720p on DVD, but it's not native.

Xvid is a compression method, it can be 480p or 720p or 1080p. Am I wrong?
So I want this filter to be positive.

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's about what one can do, it's about what the release scene does generally. I've never seen a xvid/dvd/dvdrip contain 720p content. I'd rather have this reverted.

@vasilky3

vasilky3 commented Mar 7, 2024

Copy link
Copy Markdown
Contributor Author

That's a lot of changes! Generally, mostly looks good. I'll have to test it out but won't be able to until next week or so.

Shure I was trying to make changes in a smaller PR.
But the waiting time was too long.
You can download version from my fork release section if you need.

@fugkco fugkco left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the late review. Overall I think these are some great changes. I have a few questions and changes. If you don't feel like implementing the changes, I can make them myself!

--repo="$GITHUB_REPOSITORY" \
--title="${{github.ref_name}}" \
--generate-notes \
build/script.elementum.jackett.zip

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a big fan of this to be honest. The version is already in the GitHub URL when downloading. Is there a good reason for this?

@vasilky3 vasilky3 Apr 14, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, downloaded zip need to be different. I can't rollback the version because i will overwrite the old one, with the same name file.
For example. Any *.rpm package has a version in name, while it also in repo and inside the package itself.
I added it because was straggling, not knowing which version is which on my media centre.

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean you can't rollback the version? The version is inside the addon.xml anyway?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why I wrote "can't". I can, but I need a reason.
I explained my reasoning:

  1. World best practice. It's crucial for me.
  2. Ability to store multiple versions on disc, no need to rename.
  3. If I remember correctly, @elgatito told it's crucial for storing artifacts in Kodi repository.

I didn't understand your reasons.

Comment thread src/filter.py
Comment thread src/filter.py
filtered.append(res)
continue

season_pattern = r"\W(?P<s_flag>s|season|сезон|tv-?|тв-?)[\s\(\[\{]*(?P<from>\d+)(?:\s*-\s*(?P<to>\d+))?"

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I appreciate you're adding your own language, but we'd have to add other languages here too. Often these languages wouldn't be something a user wants. I'm wondering what the right solution would be here. Maybe an additional config option?

@vasilky3 vasilky3 Apr 14, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you are right. I thought it was "not good enough". But code became better and i pointed place for langspecific string.
I thing the best way will be to use existing method with https://github.com/fugkco/script.elementum.jackett/tree/master/resources/language
and adding config property like: Extra language for torrent filtering
Not sure if it possible to have multiple language packs. I want to have interface in English, while filters also using my native language.

I was just a little bit tired to do this. And not sure if it's the best method.

Comment thread src/filter.py

if not global_ep:
continue
episode_pattern = r"(?:e?(?P<from>\d+)(?:\s*-\s*e?(?P<to>\d+)))|(?P<last>\d+)(?:\s*\+\s*\d*)?(?:\s*(из|of)\s*(?P<all>\d+))"

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here w.r.t. the language search

@vasilky3 vasilky3 Apr 14, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you want me to change/remove this?
Or can i ask you to make a better implementation in the next PR?

Comment thread src/utils.py
Comment on lines +23 to +25
('720p', [r'720[p]', r'1280x720', r'hd720p?', r'hd\-?rip', r'b[rd]rip', r'xvid', r'dvd', r'dvdrip', r'hdtv',
r'web\-(dl)?rip', r'iptv']),
('480p', [r'480[p]', r'sat\-?rip', r'tv\-?rip']),

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's about what one can do, it's about what the release scene does generally. I've never seen a xvid/dvd/dvdrip contain 720p content. I'd rather have this reverted.

@vasilky3

vasilky3 commented Apr 14, 2024

Copy link
Copy Markdown
Contributor Author

@fugkco, is this your change request on conflict?
I'm not familiar with it, you want me to rebase?

@vasilky3

Copy link
Copy Markdown
Contributor Author

added small fix, to handle timeout in case tracker temporary unavailable

@fugkco

fugkco commented Oct 29, 2024

Copy link
Copy Markdown
Owner

Hey @vasilky3, sorry for this taking so long. I've been very busy. I'm hoping the look at this properly soon.

antonsoroko and others added 3 commits April 25, 2025 00:28
Otherwise: `TypeError: object of type 'coroutine' has no len()`
Fix versioning in Makefile for addon.xlm
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants