Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: leepeuker/movary
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.62.2
Choose a base ref
...
head repository: leepeuker/movary
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Aug 21, 2024

  1. Add basic location relation to watch dates

    leepeuker committed Aug 21, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f325e78 View commit details
  2. Cleanup

    leepeuker committed Aug 21, 2024
    Copy the full SHA
    440920a View commit details
  3. Add settings page for locations

    leepeuker committed Aug 21, 2024
    Copy the full SHA
    9124979 View commit details

Commits on Aug 22, 2024

  1. Add loction CRUD endpoints

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    746b780 View commit details
  2. Finish frontend integration of location

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    42ae397 View commit details
  3. Cleanup

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    e485c28 View commit details
  4. Cleanup

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    3381263 View commit details
  5. Add mysql migration

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    f0b8d8f View commit details
  6. Display location icon on watch dates

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    8a4bcc0 View commit details
  7. Merge pull request #611 from leepeuker/add-watch-date-location

    Add location to watch dates
    leepeuker authored Aug 22, 2024
    Copy the full SHA
    40f4d70 View commit details
  8. Add location to history export

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    d90ada6 View commit details
  9. Add locations to docs

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    36e6443 View commit details
  10. Add location to movie search filter

    leepeuker committed Aug 22, 2024
    Copy the full SHA
    15f7c99 View commit details
  11. Merge pull request #612 from leepeuker/add-location-search-filter

    Add optional location filter to movie search
    leepeuker authored Aug 22, 2024
    Copy the full SHA
    e06e9a0 View commit details

Commits on Aug 25, 2024

  1. Add a dashboard row for top locations

    leepeuker committed Aug 25, 2024
    Copy the full SHA
    4c47e53 View commit details
  2. Fix tests

    leepeuker committed Aug 25, 2024
    Copy the full SHA
    4605b3e View commit details
  3. Merge pull request #613 from leepeuker/add-top-lcations-dashboard-row

    Add a dashboard row for top locations
    leepeuker authored Aug 25, 2024
    Copy the full SHA
    008b531 View commit details
  4. Fix top locations query

    leepeuker committed Aug 25, 2024
    Copy the full SHA
    2a04179 View commit details
  5. Fix top locations query (for real this time)

    leepeuker committed Aug 25, 2024
    Copy the full SHA
    0d5c16a View commit details

Commits on Sep 1, 2024

  1. Add basic UI to toggle location feature

    leepeuker committed Sep 1, 2024
    Copy the full SHA
    562560d View commit details
  2. Add basic get and post endpoints for feature toggle

    leepeuker committed Sep 1, 2024
    Copy the full SHA
    e701e2a View commit details
  3. Use feature togggle backend in frontend

    leepeuker committed Sep 1, 2024
    Copy the full SHA
    9dcfa7c View commit details
  4. Update UI to hide location elements if feature is disabled

    leepeuker committed Sep 1, 2024
    Copy the full SHA
    2402e74 View commit details
  5. Merge pull request #614 from leepeuker/add-feature-toggle-locations

    Add option to dis/enable the locations feature
    leepeuker authored Sep 1, 2024
    Copy the full SHA
    e73137f View commit details

Commits on Sep 4, 2024

  1. Update docs for locations

    leepeuker committed Sep 4, 2024
    Copy the full SHA
    d9950dd View commit details
  2. Update docs for locations

    leepeuker committed Sep 4, 2024
    Copy the full SHA
    56b1820 View commit details
  3. Improve locations UI elements and behavior

    leepeuker committed Sep 4, 2024
    Copy the full SHA
    d25eee6 View commit details
  4. Copy the full SHA
    a263739 View commit details
  5. Add last plays cinema dashboard row

    leepeuker committed Sep 4, 2024
    Copy the full SHA
    27984f0 View commit details
  6. Update docs

    leepeuker committed Sep 4, 2024
    Copy the full SHA
    7a209de View commit details
  7. Merge pull request #615 from leepeuker/add-location-option-cinema

    Add location option cinema
    leepeuker authored Sep 4, 2024
    Copy the full SHA
    a6b081c View commit details

Commits on Sep 7, 2024

  1. Fix last cinema plays query issue

    leepeuker committed Sep 7, 2024
    Copy the full SHA
    1b53a01 View commit details

Commits on Sep 11, 2024

  1. Fix export

    leepeuker committed Sep 11, 2024
    Copy the full SHA
    65e9ec0 View commit details
  2. Add support for locations to history importer

    leepeuker committed Sep 11, 2024
    Copy the full SHA
    736e5fa View commit details
  3. Merge pull request #617 from leepeuker/add-location-support-to-importer

    Add support for locations to history importer
    leepeuker authored Sep 11, 2024
    Copy the full SHA
    2957f94 View commit details
  4. Update dependencies and fix tests

    leepeuker committed Sep 11, 2024
    Copy the full SHA
    2a4c520 View commit details
  5. Fix tests

    leepeuker committed Sep 11, 2024
    Copy the full SHA
    2b3027a View commit details
  6. Update phpunit

    leepeuker committed Sep 11, 2024
    Copy the full SHA
    327d5a6 View commit details
  7. Merge pull request #618 from leepeuker/update-dependencies

    Update dependencies and fix tests
    leepeuker authored Sep 11, 2024
    Copy the full SHA
    2742f72 View commit details

Commits on Oct 21, 2024

  1. Fix imdb scraping

    leepeuker committed Oct 21, 2024
    Copy the full SHA
    1149dbe View commit details

Commits on Dec 18, 2024

  1. Added supervisord sections for migrations, set to run once.

    JVT038 committed Dec 18, 2024
    Copy the full SHA
    1d66d1b View commit details

Commits on Dec 19, 2024

  1. Refactor and improve supervisor config

    leepeuker committed Dec 19, 2024
    Copy the full SHA
    07b4877 View commit details
  2. Make local supervisor optional

    leepeuker committed Dec 19, 2024
    Copy the full SHA
    e9c3ec2 View commit details
  3. Adjust documentation

    leepeuker committed Dec 19, 2024
    Copy the full SHA
    2e692e3 View commit details
  4. Add way to disable automatic database migrations

    leepeuker committed Dec 19, 2024
    Copy the full SHA
    c7b7eef View commit details

Commits on Dec 20, 2024

  1. Set priority so that migrations run before jobs

    JVT038 committed Dec 20, 2024
    Copy the full SHA
    e6cbe55 View commit details

Commits on Dec 27, 2024

  1. Merge pull request #624 from leepeuker/refactor-supervisor-config

    Refactor supervisor config
    leepeuker authored Dec 27, 2024
    Copy the full SHA
    fa06eed View commit details
  2. Fix wrong env variable

    leepeuker authored Dec 27, 2024
    Copy the full SHA
    c716999 View commit details
  3. Merge pull request #623 from leepeuker/automatically-run-migrations

    Automatically run migrations on start
    leepeuker authored Dec 27, 2024
    Copy the full SHA
    b62e6d0 View commit details

Commits on Jan 15, 2025

  1. Only load dashboard data which is visible

    leepeuker committed Jan 15, 2025
    Copy the full SHA
    6517393 View commit details
Showing with 3,612 additions and 1,561 deletions.
  1. +3 −3 Makefile
  2. +1 −1 build/php/Dockerfile
  3. +13 −14 composer.json
  4. +1,152 −1,051 composer.lock
  5. +47 −0 db/migrations/mysql/20240821173031_AddLocationToUserWatchDatesTable.php
  6. +24 −0 db/migrations/mysql/20240901100349_AddLocationsFeatureFlagToUserTable.php
  7. +24 −0 db/migrations/mysql/20240904142241_AddCinemaFlagToLocationTable.php
  8. +74 −0 db/migrations/sqlite/20240821173031_AddLocationToUserWatchDatesTable.php
  9. +218 −0 db/migrations/sqlite/20240901100349_AddLocationsFeatureFlagToUserTable.php
  10. +54 −0 db/migrations/sqlite/20240904142241_AddCinemaFlagToLocationTable.php
  11. +2 −0 docker-compose.yml
  12. +11 −10 docs/configuration.md
  13. +15 −0 docs/features/locations.md
  14. +4 −0 docs/install/docker.md
  15. +1 −0 mkdocs.yml
  16. +2 −0 public/css/bootstrap-icons-1.10.2.css
  17. +50 −0 public/js/app.js
  18. +6 −0 public/js/component/modal-advanced-search-movie.html.js
  19. +39 −2 public/js/movie.js
  20. +308 −0 public/js/settings-account-location.js
  21. +2 −2 settings/phpstan.neon
  22. +7 −11 settings/phpunit.xml
  23. +11 −0 settings/psalm.xml
  24. +7 −0 settings/routes.php
  25. +14 −0 settings/supervisor/database-migrate.conf
  26. +3 −2 settings/supervisor/{movary.conf → job-processing.conf}
  27. +1 −1 src/Api/Github/GithubApi.php
  28. +9 −9 src/Api/Imdb/ImdbWebScrapper.php
  29. +1 −1 src/Api/Jellyfin/Cache/JellyfinCache.php
  30. +1 −2 src/Api/Jellyfin/Dto/JellyfinMovieDtoList.php
  31. +2 −2 src/Api/Jellyfin/JellyfinClient.php
  32. +1 −1 src/Api/Letterboxd/LetterboxdWebScrapper.php
  33. +1 −1 src/Api/Plex/PlexApi.php
  34. +1 −1 src/Api/Plex/PlexClient.php
  35. +1 −2 src/Api/Tmdb/Dto/TmdbCast.php
  36. +1 −2 src/Api/Tmdb/Dto/TmdbCrew.php
  37. +1 −2 src/Api/Tmdb/Dto/TmdbGenreList.php
  38. +1 −2 src/Api/Tmdb/Dto/TmdbProductionCompanyList.php
  39. +1 −2 src/Api/Tmdb/Dto/TmdbWatchProviderList.php
  40. +1 −1 src/Api/Tmdb/TmdbClient.php
  41. +3 −3 src/Api/Trakt/TraktClient.php
  42. +1 −2 src/Api/Trakt/ValueObject/User/Movie/History/DtoList.php
  43. +1 −1 src/Api/Trakt/ValueObject/User/Movie/Rating/DtoList.php
  44. +1 −2 src/Api/Trakt/ValueObject/User/Movie/Watched/DtoList.php
  45. +7 −7 src/Command/CreatePublicStorageLink.php
  46. +7 −7 src/Command/DatabaseMigrationMigrate.php
  47. +7 −7 src/Command/DatabaseMigrationRollback.php
  48. +7 −7 src/Command/DatabaseMigrationStatus.php
  49. +11 −7 src/Command/ImdbSync.php
  50. +9 −5 src/Command/JellyfinCacheDelete.php
  51. +9 −5 src/Command/JellyfinCacheRefresh.php
  52. +9 −5 src/Command/JellyfinExport.php
  53. +9 −5 src/Command/JellyfinImport.php
  54. +9 −5 src/Command/PlexWatchlistImport.php
  55. +9 −6 src/Command/ProcessJobs.php
  56. +7 −7 src/Command/TmdbCountryCacheDelete.php
  57. +7 −7 src/Command/TmdbCountryCacheRefresh.php
  58. +7 −7 src/Command/TmdbImageCacheCleanup.php
  59. +7 −7 src/Command/TmdbImageCacheDelete.php
  60. +9 −5 src/Command/TmdbImageCacheRefresh.php
  61. +10 −6 src/Command/TmdbMovieSync.php
  62. +10 −6 src/Command/TmdbPersonSync.php
  63. +9 −5 src/Command/TraktCache.php
  64. +13 −8 src/Command/TraktImport.php
  65. +7 −3 src/Command/UserCreate.php
  66. +8 −5 src/Command/UserDelete.php
  67. +7 −3 src/Command/UserHistoryExport.php
  68. +7 −7 src/Command/UserList.php
  69. +7 −3 src/Command/UserRatingExport.php
  70. +7 −3 src/Command/UserUpdate.php
  71. +1 −2 src/Domain/Company/CompanyEntityList.php
  72. +1 −1 src/Domain/Company/CompanyRepository.php
  73. +1 −2 src/Domain/Genre/GenreEntityList.php
  74. +1 −2 src/Domain/Movie/Cast/CastEntityList.php
  75. +1 −1 src/Domain/Movie/Crew/CrewApi.php
  76. +1 −2 src/Domain/Movie/Crew/CrewEntityList.php
  77. +1 −2 src/Domain/Movie/Genre/MovieGenreEntityList.php
  78. +66 −0 src/Domain/Movie/History/Location/MovieHistoryLocationApi.php
  79. +45 −0 src/Domain/Movie/History/Location/MovieHistoryLocationEntity.php
  80. +32 −0 src/Domain/Movie/History/Location/MovieHistoryLocationEntityList.php
  81. +85 −0 src/Domain/Movie/History/Location/MovieHistoryLocationRepository.php
  82. +58 −8 src/Domain/Movie/History/MovieHistoryApi.php
  83. +7 −0 src/Domain/Movie/History/MovieHistoryEntity.php
  84. +1 −2 src/Domain/Movie/History/MovieHistoryEntityList.php
  85. +42 −6 src/Domain/Movie/History/MovieHistoryRepository.php
  86. +56 −5 src/Domain/Movie/MovieApi.php
  87. +1 −2 src/Domain/Movie/MovieEntityList.php
  88. +58 −2 src/Domain/Movie/MovieRepository.php
  89. +1 −2 src/Domain/Movie/ProductionCompany/ProductionCompanyEntityList.php
  90. +1 −2 src/Domain/Person/PersonEntityList.php
  91. +13 −13 src/Domain/User/Service/Authentication.php
  92. +4 −4 src/Domain/User/Service/TwoFactorAuthenticationFactory.php
  93. +1 −1 src/Domain/User/Service/Validator.php
  94. +10 −0 src/Domain/User/UserApi.php
  95. +7 −0 src/Domain/User/UserEntity.php
  96. +23 −0 src/Domain/User/UserRepository.php
  97. +20 −19 src/Factory.php
  98. +1 −2 src/HttpController/Api/Dto/HistoryEntryDtoList.php
  99. +1 −2 src/HttpController/Api/Dto/MovieSearchResultDtoList.php
  100. +1 −2 src/HttpController/Api/Dto/PlayedEntryDtoList.php
  101. +1 −2 src/HttpController/Api/Dto/WatchDateDtoList.php
  102. +1 −2 src/HttpController/Api/Dto/WatchlistEntryDtoList.php
  103. +2 −2 src/HttpController/Api/RequestMapper/HistoryRequestMapper.php
  104. +2 −2 src/HttpController/Api/RequestMapper/PlayedRequestMapper.php
  105. +3 −3 src/HttpController/Api/RequestMapper/RequestMapper.php
  106. +2 −2 src/HttpController/Api/RequestMapper/WatchlistRequestMapper.php
  107. +0 −1 src/HttpController/Web/ActorsController.php
  108. +1 −1 src/HttpController/Web/CreateUserController.php
  109. +57 −22 src/HttpController/Web/DashboardController.php
  110. +8 −0 src/HttpController/Web/Dto/MoviesRequestDto.php
  111. +1 −1 src/HttpController/Web/Dto/PersonsRequestDto.php
  112. +8 −6 src/HttpController/Web/HistoryController.php
  113. +114 −0 src/HttpController/Web/LocationController.php
  114. +9 −7 src/HttpController/Web/Mapper/MoviesRequestMapper.php
  115. +2 −2 src/HttpController/Web/Mapper/PersonsRequestMapper.php
  116. +5 −5 src/HttpController/Web/Mapper/WatchlistRequestMapper.php
  117. +4 −0 src/HttpController/Web/MoviesController.php
  118. +12 −0 src/HttpController/Web/SettingsController.php
  119. +1 −2 src/JobQueue/JobEntityList.php
  120. +1 −1 src/JobQueue/JobQueueScheduler.php
  121. +5 −0 src/Service/Dashboard/DashboardFactory.php
  122. +20 −0 src/Service/Dashboard/Dto/DashboardRow.php
  123. +1 −2 src/Service/Dashboard/Dto/DashboardRowList.php
  124. +2 −2 src/Service/Emby/EmbyWebhookDtoMapper.php
  125. +3 −3 src/Service/Export/ExportService.php
  126. +1 −0 src/Service/Export/ExportWriter.php
  127. +1 −1 src/Service/ImageCacheService.php
  128. +2 −2 src/Service/Imdb/ImdbMovieRatingSync.php
  129. +5 −0 src/Service/ImportService.php
  130. +2 −2 src/Service/Jellyfin/JellyfinWebhookDtoMapper.php
  131. +0 −2 src/Service/JobProcessor.php
  132. +1 −1 src/Service/Letterboxd/LetterboxdExporter.php
  133. +1 −2 src/Service/Netflix/Dto/NetflixActivityItemList.php
  134. +1 −1 src/Service/Netflix/NetflixActivityItemsConverter.php
  135. +2 −2 src/Service/Plex/PlexScrobbler.php
  136. +1 −2 src/Service/Router/Dto/RouteList.php
  137. +18 −18 src/Service/ServerSettings.php
  138. +1 −1 src/Service/Tmdb/SyncMovie.php
  139. +4 −4 src/Service/Trakt/ImportWatchedMovies.php
  140. +22 −16 src/Service/Trakt/WatchDateToPlaysMap.php
  141. +4 −4 src/Util/SessionWrapper.php
  142. +5 −4 src/ValueObject/AbstractList.php
  143. +145 −0 src/ValueObject/AbstractMap.php
  144. +1 −1 src/ValueObject/Date.php
  145. +4 −4 src/ValueObject/DateFormat.php
  146. +3 −3 src/ValueObject/DateTime.php
  147. +7 −7 src/ValueObject/Gender.php
  148. +4 −4 src/ValueObject/JobStatus.php
  149. +11 −11 src/ValueObject/JobType.php
  150. +1 −1 src/ValueObject/PersonalRating.php
  151. +1 −1 src/ValueObject/Url.php
  152. +2 −2 src/ValueObject/Year.php
  153. +32 −0 templates/component/dashboard/row-last-plays-cinema.html.twig
  154. +24 −0 templates/component/dashboard/row-top-locations.html.twig
  155. +9 −0 templates/component/modal-advanced-search-movie.html.twig
  156. +6 −1 templates/component/modal-edit-watch-date.html.twig
  157. +36 −0 templates/component/modal-location.html.twig
  158. +7 −1 templates/component/modal-log-play.html.twig
  159. +3 −0 templates/component/settings-nav.html.twig
  160. +6 −0 templates/page/dashboard.html.twig
  161. +12 −3 templates/page/movie.html.twig
  162. +58 −0 templates/page/settings-account-locations.html.twig
  163. +23 −23 tests/unit/Api/Imdb/ImdbWebScrapperTest.php
  164. +4 −4 tests/unit/Domain/Company/CompanyApiTest.php
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -64,12 +64,12 @@ db_mysql_create_database:
make app_database_migrate

db_mysql_import:
docker cp storage/dump.sql movary_mysql_1:/tmp/dump.sql
docker compose exec mysql bash -c 'mysql -uroot -p${DATABASE_MYSQL_ROOT_PASSWORD} < /tmp/dump.sql'
docker cp storage/dump.sql movary-mysql-1:/tmp/dump.sql
docker compose exec mysql bash -c 'mysql -uroot -p${DATABASE_MYSQL_ROOT_PASSWORD} movary < /tmp/dump.sql'

db_mysql_export:
docker compose exec mysql bash -c 'mysqldump --databases --add-drop-database -uroot -p$(DATABASE_MYSQL_ROOT_PASSWORD) $(DATABASE_MYSQL_NAME) > /tmp/dump.sql'
docker cp movary_mysql_1:/tmp/dump.sql storage/dump.sql
docker cp movary-mysql-1:/tmp/dump.sql storage/dump.sql
chown $(USER_ID):$(USER_ID) storage/dump.sql

db_migration_create:
2 changes: 1 addition & 1 deletion build/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -10,6 +10,6 @@ ARG APPLICATION_VERSION
ENV APPLICATION_VERSION=${APPLICATION_VERSION}
COPY --chown=application ./ ./
COPY .env.production.example .env
COPY settings/supervisor/movary.conf /opt/docker/etc/supervisor.d/movary.conf
COPY settings/supervisor/ /opt/docker/etc/supervisor.d/
RUN composer install --no-dev
RUN php bin/console.php storage:link
27 changes: 13 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
@@ -13,30 +13,29 @@
"ext-mbstring": "*",
"ext-pdo": "*",
"doctrine/dbal": "^3.8.2",
"guzzlehttp/guzzle": "^7.8.1",
"guzzlehttp/guzzle": "^7.9.2",
"league/csv": "^9.15",
"maennchen/zipstream-php": "^3.1",
"monolog/monolog": "^3.5",
"monolog/monolog": "^3.7",
"nikic/fast-route": "^1.3",
"php-di/php-di": "^7.0.6",
"php-di/php-di": "^7.0.7",
"phpmailer/phpmailer": "^6.9.1",
"psr/http-client": "^1.0.3",
"ramsey/uuid": "^4.7.5",
"robmorgan/phinx": "^0.15.5",
"spomky-labs/otphp": "^11.2",
"symfony/console": "^6.4.4",
"twig/twig": "^3.8",
"ramsey/uuid": "^4.7.6",
"robmorgan/phinx": "^0.16.1",
"spomky-labs/otphp": "^11.3",
"symfony/console": "^7.1",
"twig/twig": "^3.14",
"vlucas/phpdotenv": "^5.6"
},
"require-dev": {
"phpunit/phpunit": "^9.6.17",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.9",
"phpstan/phpstan": "^1.10.59",
"phpstan/phpstan-phpunit": "^1.3.16",
"vimeo/psalm": "^4.30",
"psalm/plugin-phpunit": "^0.18.4",
"webmozarts/strict-phpunit": "^7.11.4"
"phpstan/phpstan": "^1.12.3",
"phpstan/phpstan-phpunit": "^1.4",
"vimeo/psalm": "^5.26",
"psalm/plugin-phpunit": "^0.19"
},
"scripts": {
"test": [
Loading