merge develop into main #1

Merged
Sadra3st merged 1 commits from develop into main 2026-05-21 20:44:04 +00:00
3 changed files with 42 additions and 25 deletions
Showing only changes of commit dd1de091a6 - Show all commits
+3 -3
View File
@@ -9,9 +9,9 @@ public class Main {
// Instantiate the parser
Parser parser = new Parser(filePath);
// TODO: You can test your code here before you run the unit tests.
// Example: Call your sorting methods, iterate through the returned list,
// and print out the movies to see if they match the expected results in the Help folder.
// test the code:
for (Movie movie : parser.sortByTitle())
System.out.println(movie);
System.out.println("Movies parsed successfully! Total movies: " + parser.sortByTitle().size());
+6 -5
View File
@@ -6,8 +6,9 @@ public class Movie {
private int year;
public Movie(String title, double rating, int year) {
// TODO: Initialize the instance variables (this.title, this.rating, this.year)
// with the values passed as arguments to this constructor.
this.title = title;
this.rating = rating;
this.year = year;
}
public String getTitle() {
@@ -24,9 +25,9 @@ public class Movie {
@Override
public String toString() {
// TODO: Return a string representation of the movie matching the exact required format.
// Example format: "Movie: The Godfather, Rating: 9.2, Year: 1972"
return "";
return "Movie: " + title +
", Rating: " + rating +
", Year: " + year;
}
@Override
+33 -17
View File
@@ -15,38 +15,54 @@ public class Parser {
public List<Movie> sortByTitle() {
List<Movie> sortedByTitle = new ArrayList<>(movies);
// TODO: Sort the 'sortedByTitle' list alphabetically by the movie's title.
// Hint: You can use Collections.sort() or the List.sort() method along with a custom Comparator.
// Example: Comparator.comparing(Movie::getTitle)
sortedByTitle.sort(Comparator.comparing(Movie::getTitle));
return sortedByTitle;
}
public List<Movie> sortByRating() {
List<Movie> sortedByRating = new ArrayList<>(movies);
// TODO: Sort the 'sortedByRating' list by the movie's rating in descending order (highest to lowest).
// Hint: Use Double.compare() in your Comparator or Comparator.comparingDouble().reversed().
sortedByRating.sort(Comparator.comparingDouble(Movie::getRating).reversed());
return sortedByRating;
}
public List<Movie> sortByYear() {
List<Movie> sortedByYear = new ArrayList<>(movies);
// TODO: Sort the 'sortedByYear' list by the movie's release year in descending order (newest to oldest).
// Hint: Compare the year integers. Use Integer.compare() or Comparator.comparingInt().reversed().
sortedByYear.sort(Comparator.comparingInt(Movie::getYear).reversed());
return sortedByYear;
}
private void setUp(String filePath) throws IOException {
// TODO: Create a java.io.File object using the given 'filePath'.
// TODO: Parse the HTML file using Jsoup.parse(file, "UTF-8"). This returns a Document object.
File file = new File(filePath);
Document doc;
// TODO: Extract the list of movie elements from the Document.
// Hint: Use document.select() or document.getElementsByClass() to find all elements with the class "movie".
doc = Jsoup.parse(file,"UTF-8");
// TODO: Iterate through each movie Element.
// For each movie element:
// 1. Find the title element (e.g., using selector "h3.movie-title") and get its text.
// 2. Find the rating element (e.g., using selector "span.movie-rating"). Extract the text, remove the "/10" part, and parse it to a double.
// 3. Find the year element (e.g., using selector "span.movie-year"). Extract the text and parse it to an int.
// 4. Create a new Movie object with these values and add it to the 'movies' list.
Elements Movies = doc.select(".movie");
for (Element movie : Movies) {
// get title
Element titleElement = movie.selectFirst("h3.movie-title");
String title = titleElement.text();
// get rating
Element ratingElement = movie.selectFirst("span.movie-rating");
String ratingText = ratingElement.text().replace("/10", "").trim();
double rating = Double.parseDouble(ratingText);
// get year
Element yearElement = movie.selectFirst("span.movie-year");
int year = Integer.parseInt(yearElement.text().trim());
Movie currentMovie = new Movie(title, rating, year);
movies.add(currentMovie);
}
}
}