Merge pull request #145 from jvlflame/dev

2.1.5

.github/CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.5]
+
+### Changed
+- Parameter `-SetOwned` now uses default path from settings
+
+### Fixed
+- Multiple tags are now created properly from setting `sort.metadata.nfo.format.tag`
+- Aggregated data object actress is now always created as an array
+
 ## [2.1.4]
 
 ### Changed

Dockerfile

@@ -1,24 +1,42 @@
-FROM ironmansoftware/universal:latest
-LABEL description="Universal - The ultimate platform for building web-based IT Tools"
 
-EXPOSE 5000
-VOLUME ["/data"]
-ENV Data__RepositoryPath ./data/Repository
-ENV Data__ConnectionString ./data/database.db
-ENV UniversalDashboard__AssetsFolder ./data/UniversalDashboard
-ENV Logging__Path ./data/logs/log.txt
+FROM ubuntu:18.04
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get update -y
-RUN apt-get install -y mediainfo software-properties-common
+RUN apt-get update -y && apt-get install -y curl unrar wget software-properties-common apt-transport-https
+RUN add-apt-repository multiverse
+RUN mkdir /home/Universal
+WORKDIR /home/Universal
+RUN wget https://ftp.jeff-server.com/Universal.linux-x64.1.4.6.rar \
+    && unrar x Universal.linux-x64.1.4.6.rar \
+    && rm Universal.linux-x64.1.4.6.rar
+RUN chmod +x /home/Universal/Universal.Server
+
+RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && dpkg -i packages-microsoft-prod.deb && apt-get update
+RUN add-apt-repository universe
+RUN apt-get install -y powershell
+RUN apt-get install -y mediainfo
 RUN add-apt-repository -y ppa:deadsnakes/ppa
 RUN apt-get update -y
 RUN apt-get install -y python3.8 python3-pip
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 10
 RUN pip3 install pillow googletrans
 RUN apt-get install -y git
 
-RUN pwsh -Command "Set-PSRepository PSGallery -InstallationPolicy Trusted; Install-Module Javinizer -Force"
-RUN pwsh -Command "git clone -b dev https://github.com/jvlflame/Javinizer.git; Copy-Item -Path Javinizer/dashboard/* -Recurse -Destination /data/Repository"
+# Add custom UD components
+RUN pwsh -Command "Set-PSRepository -Name 'PSGallery' -InstallationPolicy Trusted"
+RUN pwsh -Command "Install-Module UniversalDashboard.Style; Install-Module UniversalDashboard.CodeEditor"
+
+# Clone dev Javinizer branch
+WORKDIR /home
 RUN git clone -b dev https://github.com/jvlflame/Javinizer.git
-RUN cp -r Javinizer/dashboard/* /data/Repository/
-RUN rm Javinizer -rf
-ENTRYPOINT ["./home/Universal/Universal.Server"]
+
+RUN wget https://ftp.jeff-server.com/UniversalDashboard.CodeEditor.rar \
+    && unrar x UniversalDashboard.CodeEditor.rar \
+    && rm UniversalDashboard.CodeEditor.rar
+
+EXPOSE 5000
+VOLUME ["/data"]
+ENV Data__RepositoryPath ./data/Repository
+ENV Data__ConnectionString ./data/database.db
+ENV UniversalDashboard__AssetsFolder ./data/UniversalDashboard
+ENV Logging__Path ./data/logs/log.txt
+ENTRYPOINT ["/home/Universal/Universal.Server"]

dashboard/javinizer.ps1 → dashboard/jv.ps1

@@ -1,4 +1,6 @@
-Import-Module "/root/.local/share/powershell/Modules/Javinizer/2.1.3/Javinizer.psm1"
+Import-Module "/home/Javinizer/src/Javinizer/Javinizer.psm1"
+Import-Module "/home/UniversalDashboard.CodeEditor/1.0.4/UniversalDashboard.CodeEditor.psd1"
+Import-Module UniversalDashboard.Style
 
 $Pages = @()
 

src/Javinizer/Javinizer.psd1

@@ -13,7 +13,7 @@
 
     # Version number of this module.
 
-    ModuleVersion     = '2.1.4'
+    ModuleVersion     = '2.1.5'
 
     # Supported PSEditions
     # CompatiblePSEditions = @('Core')

src/Javinizer/Public/Get-JVAggregatedData.ps1

@@ -259,6 +259,12 @@ function Get-JVAggregatedData {
                         } else {
                             $aggregatedDataObject.$field = $sourceData.Id
                         }
+                    } elseif ($field -eq 'Actress') {
+                        if ($null -eq $sourceData.Actress) {
+                            $aggregatedDataObject.$field = $null
+                        } else {
+                            $aggregatedDataObject.$field = @($sourceData.Actress)
+                        }
                     } else {
                         $aggregatedDataObject.$field = $sourceData.$field
                     }
@@ -492,6 +498,7 @@ function Get-JVAggregatedData {
 
         if ($UnknownActress) {
             if ($null -eq $aggregatedDataObject.Actress) {
+                $aggregatedDataObject.Actress = @()
                 $aggregatedDataObject.Actress += [PSCustomObject]@{
                     LastName     = $null
                     FirstName    = 'Unknown'

src/Javinizer/Public/Get-JVNfo.ps1

@@ -145,7 +145,7 @@ function Get-JVNfo {
         }
 
         foreach ($item in $Tag) {
-            $item = Convert-NfoChar -String $Tag -ErrorAction SilentlyContinue
+            $item = Convert-NfoChar -String $item -ErrorAction SilentlyContinue
             $tagNfoString = @"
     <tag>$item</tag>
 

src/Javinizer/Public/Javinizer.ps1

@@ -701,6 +701,13 @@ function Javinizer {
 
             'Javlibrary' {
                 try {
+                    if (!($Path)) {
+                        $Path = $Settings.'location.input'
+                        if ($null -eq $Path -or $Path -eq '') {
+                            $Path = (Get-Location).Path
+                        }
+                    }
+
                     $javlibraryBaseUrl = $Settings.'javlibrary.baseurl'
                     $request = Invoke-WebRequest -Uri "$javlibraryBaseUrl/en/mv_owned_print.php" -WebSession $CfSession -UserAgent $CfSession.UserAgent -Verbose:$false -Headers @{
                         "method"                    = "GET"

src/Javinizer/jvLog.log

@@ -0,0 +1,77 @@
+[2020-10-17T11:53:53][INFO ] [Update-JVThumbCsv] Wrote [Aoki Juna - 青木珠菜] [Page 1] to thumb csv
+[2020-10-17T11:53:53][INFO ] [Update-JVThumbCsv] Wrote [Aoyama Mizuho - 青山水穂] [Page 1] to thumb csv
+[2020-10-17T11:53:53][INFO ] [Update-JVThumbCsv] Wrote [Arare King - アラレ王] [Page 1] to thumb csv
+[2020-10-17T11:53:53][INFO ] [Update-JVThumbCsv] Wrote [Asuka Aka - 有栖花あか] [Page 1] to thumb csv
+[2020-10-17T11:53:53][INFO ] [Update-JVThumbCsv] Wrote [Konno Tsubaki - 今野つばき] [Page 1] to thumb csv
+[2020-10-17T11:53:53][INFO ] [Update-JVThumbCsv] Wrote [Kuriyama Rio - 栗山莉緒] [Page 1] to thumb csv
+[2020-10-17T11:53:54][INFO ] [Update-JVThumbCsv] Wrote [Mineda Nanami - 峰田ななみ] [Page 1] to thumb csv
+[2020-10-17T11:53:54][INFO ] [Update-JVThumbCsv] Wrote [Shiomi Mai - 潮美舞] [Page 1] to thumb csv
+[2020-10-17T11:53:54][INFO ] [Update-JVThumbCsv] Wrote [Tachibana Miharu - 立花みはる] [Page 1] to thumb csv
+[2020-10-17T11:53:56][INFO ] [Update-JVThumbCsv] Wrote [Aisu Moe - 愛須もえ] [Page 2] to thumb csv
+[2020-10-17T11:53:56][INFO ] [Update-JVThumbCsv] Wrote [Amamiya Mona - 雨宮もな] [Page 2] to thumb csv
+[2020-10-17T11:53:57][INFO ] [Update-JVThumbCsv] Wrote [Furuse Akemi - 古瀬朱美] [Page 2] to thumb csv
+[2020-10-17T11:53:57][INFO ] [Update-JVThumbCsv] Wrote [Kashii Hinano - 香椎ひなの] [Page 2] to thumb csv
+[2020-10-17T11:53:57][INFO ] [Update-JVThumbCsv] Wrote [Maki Natsume - 真木夏芽] [Page 2] to thumb csv
+[2020-10-17T11:53:57][INFO ] [Update-JVThumbCsv] Wrote [Mizumori Meg - 水森めぐ] [Page 2] to thumb csv
+[2020-10-17T11:53:57][INFO ] [Update-JVThumbCsv] Wrote [Nagisa Konomi - 渚このみ] [Page 2] to thumb csv
+[2020-10-17T11:53:57][INFO ] [Update-JVThumbCsv] Wrote [Shiomi Aya - 塩見彩] [Page 2] to thumb csv
+[2020-10-17T11:53:58][INFO ] [Update-JVThumbCsv] Wrote [Tsukino Kasumi - 月野かすみ] [Page 2] to thumb csv
+[2020-10-17T11:54:43][INFO ] [Update-JVThumbCsv] Wrote [Aoki Juna - 青木珠菜] [Page 1] to thumb csv
+[2020-10-17T11:54:43][INFO ] [Update-JVThumbCsv] Wrote [Aoyama Mizuho - 青山水穂] [Page 1] to thumb csv
+[2020-10-17T11:54:43][INFO ] [Update-JVThumbCsv] Wrote [Arare King - アラレ王] [Page 1] to thumb csv
+[2020-10-17T11:54:43][INFO ] [Update-JVThumbCsv] Wrote [Asuka Aka - 有栖花あか] [Page 1] to thumb csv
+[2020-10-17T11:54:43][INFO ] [Update-JVThumbCsv] Wrote [Konno Tsubaki - 今野つばき] [Page 1] to thumb csv
+[2020-10-17T11:54:43][INFO ] [Update-JVThumbCsv] Wrote [Kuriyama Rio - 栗山莉緒] [Page 1] to thumb csv
+[2020-10-17T11:54:44][INFO ] [Update-JVThumbCsv] Wrote [Mineda Nanami - 峰田ななみ] [Page 1] to thumb csv
+[2020-10-17T11:54:44][INFO ] [Update-JVThumbCsv] Wrote [Shiomi Mai - 潮美舞] [Page 1] to thumb csv
+[2020-10-17T11:54:44][INFO ] [Update-JVThumbCsv] Wrote [Tachibana Miharu - 立花みはる] [Page 1] to thumb csv
+[2020-10-17T11:54:47][INFO ] [Update-JVThumbCsv] Wrote [Aisu Moe - 愛須もえ] [Page 2] to thumb csv
+[2020-10-17T11:54:47][INFO ] [Update-JVThumbCsv] Wrote [Amamiya Mona - 雨宮もな] [Page 2] to thumb csv
+[2020-10-17T11:54:47][INFO ] [Update-JVThumbCsv] Wrote [Furuse Akemi - 古瀬朱美] [Page 2] to thumb csv
+[2020-10-17T11:54:48][INFO ] [Update-JVThumbCsv] Wrote [Kashii Hinano - 香椎ひなの] [Page 2] to thumb csv
+[2020-10-17T11:54:48][INFO ] [Update-JVThumbCsv] Wrote [Maki Natsume - 真木夏芽] [Page 2] to thumb csv
+[2020-10-17T11:54:48][INFO ] [Update-JVThumbCsv] Wrote [Mizumori Meg - 水森めぐ] [Page 2] to thumb csv
+[2020-10-17T11:54:48][INFO ] [Update-JVThumbCsv] Wrote [Nagisa Konomi - 渚このみ] [Page 2] to thumb csv
+[2020-10-17T11:54:49][INFO ] [Update-JVThumbCsv] Wrote [Shiomi Aya - 塩見彩] [Page 2] to thumb csv
+[2020-10-17T11:54:50][INFO ] [Update-JVThumbCsv] Wrote [Tsukino Kasumi - 月野かすみ] [Page 2] to thumb csv
+[2020-10-17T12:16:28][INFO ] [WANZ-233] [Set-JVMovie] Completed [C:\Javinizer\wanz-233.mp4] => [C:\Javinizer\Wanz Factory\2014\WANZ-233 [Wanz Factory] - Creampie SEX - Babes Riding Cowgirl Make Men Cum Early Riko Honda (2014)\WANZ-233.mp4]
+[2020-10-17T12:17:25][INFO ] [WANZ-233] [Set-JVMovie] Completed [C:\Javinizer\wanz-233.mp4] => [C:\Javinizer\Wanz Factory (YEAR)\Honda Riko\WANZ-233\WANZ-233.mp4]
+[2020-10-17T12:39:02][WARN ] [IPX-001] [Get-DmmUrl] not matched on DMM
+[2020-10-17T18:58:41][WARN ] [R18-520] [Get-R18Url] not matched on R18
+[2020-10-17T18:58:46][WARN ] [R18-520] [Get-DmmUrl] not matched on DMM
+[2020-10-17T18:58:47][WARN ] [R18-520] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T18:58:47][WARN ] [r-18520.mp4] Skipped -- not matched
+[2020-10-17T18:58:59][INFO ] [HRV-030] [Get-JVAggregatedData] Wrote [Fujie Shiho - 藤江史帆] to thumb csv
+[2020-10-17T19:01:14][WARN ] [R18-520] [Get-R18Url] not matched on R18
+[2020-10-17T19:01:14][WARN ] [BLAH-123] [Get-R18Url] not matched on R18
+[2020-10-17T19:01:20][WARN ] [R18-520] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:01:21][WARN ] [R18-520] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T19:01:21][WARN ] [BLAH-123] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:01:21][WARN ] [r-18520.mp4] Skipped -- not matched
+[2020-10-17T19:01:21][WARN ] [BLAH-123] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T19:01:21][WARN ] [blah-123.mp4] Skipped -- not matched
+[2020-10-17T19:06:19][WARN ] [BLAH-123] [Get-R18Url] not matched on R18
+[2020-10-17T19:06:20][WARN ] [R18-520] [Get-R18Url] not matched on R18
+[2020-10-17T19:06:25][WARN ] [BLAH-123] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:06:25][WARN ] [BLAH-123] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T19:06:26][WARN ] [R18-520] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:06:26][WARN ] [R18-520] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T19:07:21][WARN ] [BLAH-123] [Get-R18Url] not matched on R18
+[2020-10-17T19:07:21][WARN ] [R18-520] [Get-R18Url] not matched on R18
+[2020-10-17T19:07:26][WARN ] [BLAH-123] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:07:27][WARN ] [R18-520] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:07:27][WARN ] [BLAH-123] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T19:07:29][WARN ] [R18-520] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T19:08:01][WARN ] [BLAH-123] [Get-R18Url] not matched on R18
+[2020-10-17T19:08:01][WARN ] [R18-520] [Get-R18Url] not matched on R18
+[2020-10-17T19:08:05][WARN ] [BLAH-123] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:08:06][WARN ] [BLAH-123] [Get-JavbusUrl] not matched on JavBus
+[2020-10-17T19:08:06][WARN ] [R18-520] [Get-DmmUrl] not matched on DMM
+[2020-10-17T19:08:07][WARN ] [R18-520] [Get-JavbusUrl] not matched on JavBus
+[2020-10-18T12:45:07][WARN ] [BLAH-123] [Get-R18Url] not matched on R18
+[2020-10-18T12:45:09][WARN ] [R18-520] [Get-R18Url] not matched on R18
+[2020-10-18T12:45:13][WARN ] [BLAH-123] [Get-DmmUrl] not matched on DMM
+[2020-10-18T12:45:14][WARN ] [BLAH-123] [Get-JavbusUrl] not matched on JavBus
+[2020-10-18T12:45:14][WARN ] [R18-520] [Get-DmmUrl] not matched on DMM
+[2020-10-18T12:45:15][WARN ] [R18-520] [Get-JavbusUrl] not matched on JavBus
+[2020-10-31T15:02:38][ERROR] [Javinizer] Error occurred when authenticating to JAVLibrary, check that your userid and session cookies are valid

src/Javinizer/jvSettings.json

@@ -100,6 +100,9 @@
     "javlibrary.cookie.cfclearance": "",
     "javlibrary.cookie.session": "",
     "javlibrary.cookie.userid": "",
+    "web.sort.recurse": 1,
+    "web.sort.strict": 0,
+    "web.navigation.pagesize": 5,
     "admin.log": 1,
     "admin.log.level": "info"
 }