v5.1.0

New features : You can edit the movies directly on the website Added support for QNAP
ChocolateApp · Dec 3, 2022 · c50a26e · c50a26e
1 parent df28802
commit c50a26e
Show file tree

Hide file tree

Showing 36 changed files with 2,938 additions and 563 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ database.db
 static/bios/*
 !static/bios/readme.txt
 .vscode/tasks.json
-static/img/*
+static/img/*
+.venv
diff --git a/README.md b/README.md
@@ -46,7 +46,11 @@ This is what you have to do to get started with Chocolate :
 
 #### For Windows
 * No installer available actually
-* So download the source code and install the dependencies
+* So download the source code and install the dependencies (requirements.txt and ffmpeg)
+
+#### For QNAP
+* Go here: [https://www.myqnap.org/product/chocolate81/](https://www.myqnap.org/product/chocolate81/)
+* Enjoy !
 
 ### Files organizations
 
@@ -144,14 +148,9 @@ Don't forget to give the project a star! Thanks again!
 ## TO-DO for Chocolate Server
 - [ ] A docker image **URGENT**
 - [ ] Create a plugin system
-- [ ] Use Flask-PWA
-- [ ] Add all audio tracks
 - [ ] Add the mobile ui of the video player
-- [ ] Dev a mobile/TV app with chromecasting, and download
-- [ ] Edit movie metadata directly on the website
 - [ ] Add Books, PDF, Epub
 - [ ] Add Musics
-- [ ] Add TV with M3U/M3U8 playlist
 - [ ] Add a watchtogether system
 - [ ] Translate in multiple languages
 - [ ] Multiple interface
@@ -165,6 +164,10 @@ Don't forget to give the project a star! Thanks again!
 ### Work in progress
 
 - [ ] Detect series intro and skip them
+- [ ] Dev a mobile/TV app with chromecasting, and download
+- [ ] Use Flask-PWA
+- [ ] Add all audio tracks
+- [ ] Add TV with M3U/M3U8 playlist
 
 ### Tasks Done
 - [X] Increase the boot speed
@@ -185,6 +188,7 @@ Don't forget to give the project a star! Thanks again!
 - [X] Create a systeme of library
 - [X] Increase the search system
 - [X] Upgrade the responsive
+- [X] Edit movie metadata directly on the website
 
 
 <!-- CONTACT -->

diff --git a/app.py b/app.py
diff --git a/config.ini b/config.ini
@@ -1,14 +1,14 @@
 [ChocolateSettings]
 version = 5.0.0
-localip = Empty
+localip = 192.168.88.1
 port = 8500
-language = Empty
+language = FR
 askwhichserie = false
 askwhichmovie = false
 compressps1games = true
-discordrpc = false
+discordrpc = true
 
 [APIKeys]
-tmdb = Empty
-igdbid = Empty
-igdbsecret = Empty
+tmdb = cb862a91645ec50312cf636826e5ca1f
+igdbid = gg2a9nfwwx0kptopibi3jgsuhm2bez
+igdbsecret = c7kxyjykj1cgfyvlju00yitpyliei7
diff --git a/requirements.txt b/requirements.txt
@@ -1,20 +1,38 @@
 ask_lib==1.1.0
 beautifulsoup4==4.11.1
+brotli==1.0.9
+configparser==3.8.1
+cryptography==38.0.0
+Cython==0.29.32
 deep_translator==1.9.1
+dl==0.1.0
+docutils==0.19
 Flask==2.2.2
 Flask_Cors==3.0.10
 Flask_Login==0.6.2
 flask_sqlalchemy==3.0.2
 get_video_properties==0.1.1
-GitPython==3.1.29
 GPUtil==1.4.0
+HTMLParser==0.0.2
 ImageHash==4.3.1
+importlib_metadata==5.1.0
+keyring==23.11.0
+langcodes==3.3.0
+lockfile==0.12.2
+lxml==4.7.1
 MarkupSafe==2.1.1
-opencv_python==4.6.0.66
+numpy==1.22.1
+opencv_python==4.5.5.64
+ordereddict==1.1
 Pillow==9.3.0
+protobuf==4.21.9
+pyOpenSSL==22.1.0
 pypresence==4.2.0
 python_Levenshtein==0.20.8
-requests==2.26.0
+pywin32==303
 SQLAlchemy==1.4.41
 tmdbv3api==1.7.7
+toml==0.10.2
+tornado==6.1
 Werkzeug==2.2.2
+zipp==3.11.0
diff --git a/static/css/style.css b/static/css/style.css
@@ -331,7 +331,11 @@ form#searchForm:hover .form_field_search {
     font-size: 4vh;
 }
 
-.portInput {
+.portInput,
+.languageDiv,
+.tmdbKeyDiv,
+.igdbSecretDiv,
+.igdbIDDiv {
     padding: 2vh;
 }
 
@@ -403,10 +407,57 @@ label[for="addLibraryButton"] {
 }
 
 .video-js .vjs-current-time,
-.video-js .vjs-audio-button {
+.video-js .vjs-audio-button,
+.video-js .vjs-captions-button,
+.video-js.vjs-http-source-selector {
     display: block !important;
 }
 
+.js-focus-visible .vjs-menu li.vjs-selected:hover,
+.vjs-menu li.vjs-selected,
+.vjs-menu li.vjs-selected:focus,
+.vjs-menu li.vjs-selected:hover {
+    background-color: rgba(255, 255, 255, 0.25) !important;
+}
+
+.video-js .vjs-captions-button .vjs-icon-placeholder:before,
+.video-js:lang(en) .vjs-subs-caps-button .vjs-icon-placeholder:before,
+.video-js:lang(fr-CA) .vjs-subs-caps-button .vjs-icon-placeholder:before,
+.vjs-icon-captions:before {
+    content: "\f10c" !important;
+}
+
+.vjs-icon-cog:before {
+    font-size: 1.8em;
+}
+
+.vjs-quality-selector .vjs-menu-button {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    width: 100%
+}
+
+.vjs-quality-selector .vjs-icon-placeholder {
+    font-family: 'Poppins', sans-serif;
+}
+
+.vjs-quality-changing .vjs-big-play-button {
+    display: none
+}
+
+.vjs-quality-changing .vjs-control-bar {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    visibility: visible;
+    opacity: 1
+}
+
+.vjs-quality-selector .vjs-icon-placeholder::before {
+    content: '' !important;
+}
+
 @keyframes showPencil {
     0% {
         transform: scale(0);
@@ -482,14 +533,10 @@ input[type="radio"] {
 .libraryName,
 .libraryPath {
     text-align: center;
-    width: 32vw;
+    width: 44vw;
     margin-top: 12vh;
     font-size: 2vw;
-    margin-left: 19vw;
-}
-
-.libraryPath {
-    width: 34vw;
+    margin-left: 10vw;
 }
 
 .libraryUsers {
@@ -506,7 +553,8 @@ input[type="radio"] {
     transform: scale(1.25);
 }
 
-label[for="movie"],
+label[for="movies"],
+label[for="series"],
 label[for="tv"],
 label[for="games"] {
     text-align: center;
@@ -1242,20 +1290,23 @@ input[type="search"]::-webkit-search-results-decoration {
     display: inline-grid;
     grid-template-rows: 1fr;
     grid-row-gap: 0px;
-    width: 97vw;
+    width: 94vw;
     margin-top: 14vw;
     justify-items: center;
     align-items: center;
 }
 
+.allUsers>div {
+    cursor: pointer;
+}
+
 .allUsers>div>img {
     border-radius: 1vh;
     height: 13vw;
     width: 13vw;
 }
 
 .allUsers>div>h1 {
-    width: 13vw;
     text-align: center;
 }
 
@@ -1593,6 +1644,101 @@ input:checked+.slider:before {
     vertical-align: middle;
 }
 
+.selectMovieText,
+.selectMovieSecondText {
+    text-align: center;
+}
+
+.selectMovieText {
+    margin-top: 6vh;
+}
+
+.editMovieDiv {
+    display: inline-grid;
+    grid-template-rows: 2fr;
+    width: 94vw;
+    margin-left: 3vw;
+    justify-items: center;
+    align-items: center;
+    grid-template-columns: repeat(4, 1fr);
+    row-gap: 1vh;
+    margin-top: 6vh;
+}
+
+.movieFinded,
+.customMovieDIV {
+    user-select: none;
+    font-size: 0.7vh;
+    width: 15vw;
+    display: grid;
+    justify-content: center;
+    text-align: center;
+    background: rgb(39 39 39 / 0.62);
+    padding: 1vw;
+    border-radius: 1vw;
+    row-gap: 2vh;
+    height: 48vh;
+    transition: 300ms ease-in-out;
+}
+
+.movieFinded:hover {
+    cursor: pointer;
+    transform: scale(1.025);
+    transition: 300ms ease-in-out;
+}
+
+.movieFinded>img {
+    object-fit: cover;
+    height: 44vh;
+    width: 15vw;
+    border-radius: 1vw;
+}
+
+label[for="movieID"] {
+    font-size: 3vh;
+    height: 4vh;
+}
+
+.customeIDExplication {
+    font-size: 2vh;
+    height: 9vh;
+}
+
+#movieID {
+    border: none;
+    padding-left: 0.5vw;
+    font-size: 2vh;
+    height: 4vh;
+    background: rgba(157, 157, 157, 0.25);
+    border-radius: 2vw;
+    z-index: 2;
+    filter: drop-shadow(0.1vh 0.1vh 0.5vh #000);
+    color: #ffffff;
+    width: 15vw;
+}
+
+#customMovieButton {
+    border-radius: 1.5vw;
+    border: 0.2vw solid #ffffff;
+    cursor: pointer;
+    color: #ffffff;
+    font-size: 1.4vh;
+    padding: 3vh 4vw;
+    text-decoration: none;
+    font-weight: 700;
+    align-items: center;
+    transition: 300ms background, color;
+    z-index: 5;
+    text-shadow: 0.1vh 0.1vh 0.5vh #000;
+    box-shadow: 0.1vh 0.1vh 0.5vh #000;
+    background: none;
+}
+
+#customMovieButton:hover {
+    background: white;
+    color: #1d1d1d;
+}
+
 @media (max-width: 640px) {
     * {
         margin: 0;
@@ -1658,18 +1804,6 @@ input:checked+.slider:before {
         width: 6vw !important;
         left: 0px !important;
     }
-    .homeIcon {
-        top: 16vh;
-    }
-    .movieIcon {
-        top: 26vh;
-    }
-    .tvIcon {
-        top: 36vh;
-    }
-    .gameIcon {
-        top: 46vh;
-    }
     .logo {
         width: 5.5vw;
         height: auto;
@@ -2110,4 +2244,22 @@ input:checked+.slider:before {
     .episodes {
         margin-top: 50vh;
     }
+    form#searchForm:hover .form_field_search {
+        transition: width 300ms;
+        width: 60vw;
+        font-size: 2vh;
+    }
+    .user {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
+    .passwordLogin {
+        margin-left: 0 !important;
+        width: 60vw;
+    }
+    #submitLogin {
+        padding: 3vh 16vw;
+        margin-left: 10vw;
+    }
 }