Skip to content

Commit aba7fe4

Browse files
ArrowarArrowar
committed
rufus si incazza
1 parent 9480155 commit aba7fe4

File tree

9 files changed

+33
-90
lines changed

9 files changed

+33
-90
lines changed

‎GUI/searchapp/api/animeunity.py‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,13 @@ def search(self, query: str) -> List[MediaItem]:
5252
for element in database.media_list:
5353
item_dict = element.__dict__.copy() if hasattr(element, '__dict__') else {}
5454

55-
# Extract basic info
56-
title = item_dict.get('title') or item_dict.get('name') or 'Unknown'
57-
item_type = (item_dict.get('type') or 'series').lower()
58-
59-
# Extract poster/image
60-
poster = (item_dict.get('poster') or item_dict.get('poster_url') or item_dict.get('image') or item_dict.get('cover'))
61-
if isinstance(poster, dict):
62-
poster = poster.get('url') or poster.get('large')
63-
64-
# Extract year
65-
year = item_dict.get('year')
66-
release_date = item_dict.get('release_date') or item_dict.get('date')
67-
if not year and release_date:
68-
try:
69-
year = int(str(release_date)[:4])
70-
except:
71-
pass
72-
7355
media_item = MediaItem(
7456
id=item_dict.get('id'),
75-
title=title,
57+
title=item_dict.get('name'),
7658
slug=item_dict.get('slug', ''),
77-
type=item_type,
59+
type=item_dict.get('type'),
7860
url=item_dict.get('url'),
79-
poster=poster,
80-
release_date=release_date,
81-
year=year,
61+
poster=item_dict.get('image'),
8262
raw_data=item_dict
8363
)
8464
results.append(media_item)
@@ -149,6 +129,7 @@ def start_download(self, media_item: MediaItem, season: Optional[str] = None, ep
149129
selections = None
150130
if episodes:
151131
selections = {'episode': episodes}
132+
152133
elif not media_item.is_movie:
153134
# Default: download all episodes
154135
selections = {'episode': '*'}

‎GUI/searchapp/api/streamingcommunity.py‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,14 @@ def search(self, query: str) -> List[MediaItem]:
5151
for element in database.media_list:
5252
item_dict = element.__dict__.copy() if hasattr(element, '__dict__') else {}
5353

54-
# Extract basic info
55-
title = item_dict.get('title') or item_dict.get('name') or 'Unknown'
56-
item_type = (item_dict.get('type') or 'unknown').lower()
57-
58-
# Extract poster/image
59-
poster = (item_dict.get('poster') or item_dict.get('poster_url') or item_dict.get('image') or item_dict.get('backdrop'))
60-
if isinstance(poster, dict):
61-
poster = poster.get('url') or poster.get('large')
62-
63-
# Extract year
64-
year = item_dict.get('year')
65-
release_date = item_dict.get('release_date') or item_dict.get('first_air_date')
66-
if not year and release_date:
67-
try:
68-
year = int(str(release_date)[:4])
69-
except:
70-
pass
71-
7254
media_item = MediaItem(
7355
id=item_dict.get('id'),
74-
title=title,
56+
title=item_dict.get('name'),
7557
slug=item_dict.get('slug', ''),
76-
type=item_type,
58+
type=item_dict.get('type'),
7759
url=item_dict.get('url'),
78-
poster=poster,
79-
release_date=release_date,
80-
year=year,
60+
poster=item_dict.get('image'),
61+
release_date=item_dict.get('date'),
8162
raw_data=item_dict
8263
)
8364
results.append(media_item)

‎GUI/searchapp/views.py‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,22 @@ def _media_item_to_display_dict(item: MediaItem, source_alias: str) -> Dict[str,
4242
parsed_date = datetime.strptime(str(item.release_date)[:10], fmt)
4343
display_release = str(parsed_date.year)
4444
break
45-
except:
45+
46+
except Exception:
4647
continue
48+
4749
if not display_release:
4850
try:
4951
display_release = str(int(str(item.release_date)[:4]))
50-
except:
52+
53+
except Exception:
5154
display_release = str(item.release_date)
52-
except:
55+
56+
except Exception:
5357
pass
5458

5559
result['display_release'] = display_release
56-
57-
# Store full item data as JSON
58-
try:
59-
result['payload_json'] = json.dumps(item.to_dict())
60-
except:
61-
result['payload_json'] = json.dumps({
62-
'id': item.id,
63-
'title': item.title,
64-
'slug': item.slug,
65-
'type': item.type
66-
})
60+
result['payload_json'] = json.dumps(item.to_dict())
6761

6862
return result
6963

@@ -106,12 +100,7 @@ def search(request: HttpRequest) -> HttpResponse:
106100
)
107101

108102

109-
def _run_download_in_thread(
110-
site: str,
111-
item_payload: Dict[str, Any],
112-
season: str = None,
113-
episodes: str = None,
114-
) -> None:
103+
def _run_download_in_thread(site: str, item_payload: Dict[str, Any], season: str = None, episodes: str = None) -> None:
115104
"""Run download in background thread."""
116105
def _task():
117106
try:
@@ -214,12 +203,7 @@ def start_download(request: HttpRequest) -> HttpResponse:
214203
return redirect("search_home")
215204

216205
# Extract title for message
217-
title = (
218-
item_payload.get("display_title")
219-
or item_payload.get("title")
220-
or item_payload.get("name")
221-
or "contenuto selezionato"
222-
)
206+
title = item_payload.get("title")
223207

224208
# For animeunity, default to all episodes if not specified and not a movie
225209
site = source_alias.split("_")[0].lower()
@@ -316,23 +300,19 @@ def series_detail(request: HttpRequest) -> HttpResponse:
316300
messages.error(request, "Errore nel parsing dei dati.")
317301
return redirect("search_home")
318302

319-
title = (
320-
item_payload.get("display_title")
321-
or item_payload.get("title")
322-
or item_payload.get("name")
323-
or "Serie"
324-
)
303+
title = item_payload.get("title")
325304

326305
# Prepare download parameters
327306
if download_type == "full_season":
328307
episode_selection = "*"
329308
msg_detail = f"stagione {season_number} completa"
309+
330310
else:
331311
episode_selection = selected_episodes.strip() if selected_episodes else None
332312
if not episode_selection:
333313
messages.error(request, "Nessun episodio selezionato.")
334314
return redirect("series_detail") + f"?source_alias={source_alias}&item_payload={item_payload_raw}"
335-
msg_detail = f"episodi {episode_selection} della stagione {season_number}"
315+
msg_detail = f"S{season_number}:E{episode_selection}"
336316

337317
# Start download
338318
_run_download_in_thread(source_alias, item_payload, season_number, episode_selection)

‎StreamingCommunity/Api/Site/crunchyroll/site.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ def title_search(query: str) -> int:
102102
title = item.get("title", "")
103103

104104
media_search_manager.add_media({
105-
'url': url,
106105
'name': title,
107-
'type': tipo
106+
'type': tipo,
107+
'url': url
108108
})
109109
found += 1
110110

‎StreamingCommunity/Api/Site/guardaserie/site.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ def title_search(query: str) -> int:
5353
try:
5454
serie_info = {
5555
'name': serie_div.find('a').get("title").replace("streaming guardaserie", ""),
56-
'url': serie_div.find('a').get("href"),
5756
'type': 'tv',
58-
'image': f"{site_constant.FULL_URL}/{serie_div.find('img').get('src')}",
57+
'url': serie_div.find('a').get("href"),
58+
'image': f"{site_constant.FULL_URL}/{serie_div.find('img').get('src')}"
5959
}
6060
media_search_manager.add_media(serie_info)
6161

‎StreamingCommunity/Api/Site/hd4me/site.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def title_search(query: str) -> int:
3636
media_search_manager.clear()
3737
table_show_manager.clear()
3838

39-
search_url = f"https://hd4me.net/lista-film"
39+
search_url = "https://hd4me.net/lista-film"
4040
console.print(f"[cyan]Search url: [yellow]{search_url}")
4141

4242
try:
@@ -63,10 +63,11 @@ def title_search(query: str) -> int:
6363

6464
if query.lower() in title.lower():
6565
media_dict = {
66-
'url': 'https://hd4me.net' + href,
66+
'id': id_attr,
6767
'name': title,
6868
'type': 'film',
69-
'id': id_attr
69+
'url': 'https://hd4me.net' + href,
70+
'image': None
7071
}
7172
media_search_manager.add_media(media_dict)
7273

‎StreamingCommunity/Api/Site/mediasetinfinity/site.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ def title_search(query: str) -> int:
7979
date = ''
8080

8181
media_search_manager.add_media({
82-
"url": item.get("cardLink", {}).get("value", ""),
8382
"id": item.get("guid", ""),
8483
"name": item.get("cardTitle", "No Title"),
8584
"type": item_type,
8685
"image": None,
8786
"date": date,
87+
"url": item.get("cardLink", {}).get("value", "")
8888
})
8989

9090
return media_search_manager.get_length()

‎StreamingCommunity/Api/Site/raiplay/site.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ def title_search(query: str) -> int:
8686

8787
media_search_manager.add_media({
8888
'id': item.get('id', ''),
89-
'name': item.get('titolo', 'Unknown'),
90-
'type': "tv",
9189
'path_id': path_id,
90+
'name': item.get('titolo', 'Unknown'),
91+
'type': 'tv',
9292
'url': url,
9393
'image': image,
9494
'year': image.split("/")[5]

‎StreamingCommunity/Lib/Downloader/DASH/downloader.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ def finalize_output(self):
613613
try:
614614
os.rmdir(self.out_path)
615615

616-
except Exception as e:
616+
except Exception:
617617
pass
618618

619619
# Verify the final file exists before returning

0 commit comments

Comments
 (0)