search

javinizer / Javinizer

(NSFW) Organize your local Japanese Adult Video (JAV) library
MIT License
606 stars 63 forks source link

Version 2.0.0 modifies user-specified regex for ID when searching #88

Closed org0ne closed 4 years ago

org0ne commented 4 years ago

1.7.6 uncensored ini.txt uncensored.json.txt

Expected Behavior

Was interested in testing 2.0.0.

I have built a custom regex to grab the ID for uncensored movies which works fine in 1.7.6, but I am seeing that this ID is being modifed by Javinizer 2.0.0 before it is used as the basis for the search:

Result in 1.7.6

javinizer -ImportSettings '/home/user/.local/share/powershell/Modules/Javinizer/1.7.6/uncensored.ini' -path '/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/'

DEBUG: [2020-09-18T13:06:46][Import-IniSettings] Settings file at [/home/user/.local/share/powershell/Modules/Javinizer/1.7.6/uncensored.ini] loaded
DEBUG: [2020-09-18T13:06:46][Javinizer] R18: [False]; R18Zh: [False] Dmm: [False]; Javlibrary: [False]; JavlibraryZh: [False]; JavlibraryJa: [False]; Javbus: [True]; JavbusJa: [True]; Jav321: [True]
DEBUG: [2020-09-18T13:06:46][Javinizer] Attempting to read file(s) from path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/]
DEBUG: [2020-09-18T13:06:46][Convert-JavTitle] Function started
DEBUG: [2020-09-18T13:06:46][Get-VideoFile] Function started
DEBUG: [2020-09-18T13:06:46][Convert-CommaDelimitedString] Begin string: [*-trailer.*,*-5.*], End string [*-trailer.* *-5.*]
DEBUG: [2020-09-18T13:06:46][Convert-CommaDelimitedString] Begin string: [asf,avi,flv,m4v,mkv,mp4,mov,rmvb,wmv,mpg], End string [asf avi flv m4v mkv mp4 mov rmvb wmv mpg]
DEBUG: [2020-09-18T13:06:46][Get-VideoFile] Function ended
DEBUG: [2020-09-18T13:06:46][Convert-JavTitle] Match 11
DEBUG: [2020-09-18T13:06:46][Convert-JavTitle] Function ended
DEBUG: [2020-09-18T13:06:46][Javinizer] Detected path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/] as directory and destinationpath: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/] as directory
[2020-09-18T13:06:46][Javinizer] Sort path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/]
[2020-09-18T13:06:46][Javinizer] Destination path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/]
[2020-09-18T13:06:46][Javinizer] Included file ext: [asf,avi,flv,m4v,mkv,mp4,mov,rmvb,wmv,mpg]
[2020-09-18T13:06:46][Javinizer] Excluded file strings: [*-trailer.*,*-5.*]
[2020-09-18T13:06:46][Javinizer] (1 of 1) Sorting [010112_248-1pon-whole1_hd.avi]
DEBUG: [2020-09-18T13:06:46][Get-AggregatedDataObject] Function started
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [actress]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [actressthumburl]; Priority setting: [javbus]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [alternatetitle]; Priority setting: [javbus  jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [coverurl]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [description]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [director]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [genre]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [id]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [label]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [runtime]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [maker]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [rating]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [ratingcount]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [releasedate]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [releaseyear]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [series]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [screenshoturl]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [title]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-MetadataPriority] Priority type loaded: [trailerurl]; Priority setting: [javbus jav321]
DEBUG: [2020-09-18T13:06:46][Get-AggregatedDataObject] Type: [FileDetails]
DEBUG: [2020-09-18T13:06:46][Get-JavbusDataObject] Function started
DEBUG: [2020-09-18T13:06:46][Get-JavbusUrl] Function started
DEBUG: [2020-09-18T13:06:46][Get-JavbusUrl] Performing [GET] on Uri [https://www.javbus.com/search/010112_248&type=0&parent=uc]
DEBUG: [2020-09-18T13:06:46][Get-JavbusUrl] Searching [1] of [1] results for [010112_248]
DEBUG: [2020-09-18T13:06:46][Get-JavbusUrl] Performing [GET] on Uri [https://www.javbus.com/010112_248]
DEBUG: [2020-09-18T13:06:47][Get-JavbusDataObject] Performing [GET] on Uri [https://www.javbus.com/en/010112_248]
DEBUG: [2020-09-18T13:06:47][Get-JavbusDataObject] JavBus data object:
DEBUG: 
Source          : javbus
Url             : https://www.javbus.com/en/010112_248
Id              : 010112_248
Title           : 「謹賀新年LOVE」
Date            : 2012-01-01
Year            : 2012
Runtime         : 60
Director        : 
Maker           : 1pondo
Label           : 
Series          : 
Rating          : 
Actress         : Yuria Tominaga
ActressThumbUrl : https://images.javbus.com/actress/3xz.jpg
Genre           : {AV女優, フェラ, 浴衣・着物, クンニ…}
CoverUrl        : https://images.javbus.com/cover/5r2_b.jpg
ScreenshotUrl   : 

DEBUG: [2020-09-18T13:06:47][Get-JavbusDataObject] Function ended
DEBUG: [2020-09-18T13:06:47][Get-JavbusDataObject] Function started
DEBUG: [2020-09-18T13:06:47][Get-JavbusUrl] Function started
DEBUG: [2020-09-18T13:06:47][Get-JavbusUrl] Performing [GET] on Uri [https://www.javbus.com/search/010112_248&type=0&parent=uc]
DEBUG: [2020-09-18T13:06:47][Get-JavbusUrl] Searching [1] of [1] results for [010112_248]
DEBUG: [2020-09-18T13:06:47][Get-JavbusUrl] Performing [GET] on Uri [https://www.javbus.com/010112_248]
DEBUG: [2020-09-18T13:06:48][Get-JavbusDataObject] Performing [GET] on Uri [https://www.javbus.com/ja/010112_248]
DEBUG: [2020-09-18T13:06:48][Get-JavbusDataObject] JavBus data object:
DEBUG: 
Source          : javbus
Url             : https://www.javbus.com/ja/010112_248
Id              : 010112_248
Title           : 「謹賀新年LOVE」
Date            : 2012-01-01
Year            : 2012
Runtime         : 60
Director        : 
Maker           : 一本道
Label           : 
Series          : 
Rating          : 
Actress         : 富永ユリア
ActressThumbUrl : https://images.javbus.com/actress/3xz.jpg
Genre           : {AV女優, フェラ, 浴衣・着物, クンニ…}
CoverUrl        : https://images.javbus.com/cover/5r2_b.jpg
ScreenshotUrl   : 

DEBUG: [2020-09-18T13:06:48][Get-JavbusDataObject] Function ended
DEBUG: [2020-09-18T13:06:48][Get-Jav321DataObject] Function started
DEBUG: [2020-09-18T13:06:48][Get-Jav321Url] Function started
DEBUG: [2020-09-18T13:06:48][Get-Jav321Url] Performing [GET] on Uri [https://jp.jav321.com/search]
VERBOSE: [2020-09-18T13:06:49][Get-Jav321Url] Search [010112_248] not matched on Jav321
VERBOSE: [2020-09-18T13:06:49][Get-Jav321DataObject] Search [010112_248] not matched on jav321
DEBUG: [2020-09-18T13:06:49][Get-Jav321DataObject] Function ended
DEBUG: [2020-09-18T13:06:49][Convert-CommaDelimitedString] Begin string: [Featured Actress,Hi-Def], End string [Featured Actress Hi-Def]
DEBUG: [2020-09-18T13:06:49][Get-AggregatedDataObject] Ignored genres: [Featured Actress Hi-Def]
DEBUG: [2020-09-18T13:06:49][Get-NewFileDirName] Function started
DEBUG: [2020-09-18T13:06:49][Get-NewFileDirName] Function ended
DEBUG: 
Search               : 010112_248
Id                   : 010112_248
AjaxId               : 
JavlibraryUrl        : 
Title                : 「謹賀新年LOVE」
AlternateTitle       : 「謹賀新年LOVE」
Description          : 
ReleaseDate          : 2012-01-01
ReleaseYear          : 2012
Runtime              : 60
Director             : 
Maker                : 1pondo
Label                : 
Series               : 
Rating               : 
RatingCount          : 
Actress              : {Yuria Tominaga}
Genre                : {AV女優, フェラ, 浴衣・着物, クンニ…}
ActressThumbUrl      : https://images.javbus.com/actress/3xz.jpg
CoverUrl             : https://images.javbus.com/cover/5r2_b.jpg
ScreenshotUrl        : 
TrailerUrl           : 
DisplayName          : Yuria Tominaga - 「謹賀新年LOVE」 [010112_248]
FolderName           : 1pondo-010112_248 Yuria Tominaga - 「謹賀新年LOVE」 (2012-01-01)
ScreenshotFolderName : extrafanart
ScreenshotImgName    : fanart
ActorImgFolderName   : .actors
FileName             : 010112_248
PosterName           : ""
ThumbnailName        : fanart
TrailerName          : 010112_248-trailer
NfoName              : 010112_248
OriginalFileName     : 010112_248-1pon-whole1_hd.avi
OriginalBaseName     : 010112_248-1pon-whole1_hd
OriginalDirectory    : /storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)
OriginalFullName     : /storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/010112_248-1pon-whole1_hd.avi
PartNumber           : 

DEBUG: [2020-09-18T13:06:49][Get-AggregatedDataObject] Function ended
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Function started
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Crop path: [/home/user/.local/share/powershell/Modules/Javinizer/1.7.6/crop.py]
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Folder path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)]
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Nfo path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/010112_248-1pon-whole1_hd.nfo]
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Cover path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/fanart.jpg]
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Poster path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/"".jpg]
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Screenshot path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/extrafanart]
DEBUG: [2020-09-18T13:06:49][Set-JavMovie] Trailer path: [/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/010112_248-trailer.mp4]
DEBUG: [2020-09-18T13:06:49][Test-RequiredMetadata] Function started
DEBUG: [2020-09-18T13:06:49][Convert-CommaDelimitedString] Begin string: [coverurl,genre,id,maker,title,releasedate,releaseyear], End string [coverurl genre id maker title releasedate releaseyear]
DEBUG: [2020-09-18T13:06:49][Test-RequiredMetadata] Function ended
DEBUG: [2020-09-18T13:06:50][Get-MetadataNfo] NFO String: 
        <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<movie>
    <title>Yuria Tominaga - 「謹賀新年LOVE」 [010112_248]</title>
    <originaltitle>「謹賀新年LOVE」</originaltitle>
    <id>010112_248</id>
    <releasedate>2012-01-01</releasedate>
    <year>2012</year>
    <director></director>
    <studio>1pondo</studio>
    <rating></rating>
    <votes></votes>
    <plot></plot>
    <runtime>60</runtime>
    <trailer></trailer>
    <mpaa>XXX</mpaa>
    <set></set>
    <tag></tag>
    <genre>AV女優</genre>
    <genre>フェラ</genre>
    <genre>浴衣・着物</genre>
    <genre>クンニ</genre>
    <genre>Creampie</genre>
    <genre>巨乳</genre>
    <genre>美乳</genre>
    <genre>69</genre>
    <genre>Shiofuki</genre>
    <actor>
        <name>Yuria Tominaga</name>
        <thumb>https://images.javbus.com/actress/3xz.jpg</thumb>
        <role>Actress</role>
    </actor>
</movie>
DEBUG: [2020-09-18T13:06:50][Set-JavMovie] Function ended

Current Behavior

javinizer -settingspath '/home/user/.local/share/powershell/Modules/Javinizer/2.0.0/uncensored.json' -path '/storage/pool/.pr0n/Scraped/Web Uncensored/test/1pondo-010112_248 Yuria Tominaga - Happy New Year LOVE (01-01-2012)/'   

DEBUG: [Javinizer] [Setting - sort.movetofolder] replaced as [1]
DEBUG: [Javinizer] [Setting - sort.renamefile] replaced as [0]
DEBUG: [0112_248] [Get-JavbusUrl] Performing [GET] on URL [https://www.javbus.com/search/0112_248&type=0&parent=uc]
DEBUG: [0112_248] [Get-JavbusUrl] Performing [GET] on URL [https://www.javbus.com/uncensored/search/0112_248&type=0&parent=uc]
DEBUG: [0112_248] [Get-JavbusUrl] Searching [1] of [1] results for [0112_248]
DEBUG: [0112_248] [Get-JavbusUrl] Performing [GET] on URL [https://www.javbus.com/010112_248]                                                                                                              DEBUG: Result [1] is [010112_248]
WARNING: [0112_248] [Get-JavbusUrl] not matched on JavBus                                                                                                                                                  DEBUG: [0112_248] [Get-JVData] [Search - Javbus] [Url - ]
DEBUG: [0112_248] [Get-Jav321Url] Performing [GET] on URL [https://jp.jav321.com/search]                                                                                                                   WARNING: [0112_248] [Get-Jav321Url] Search [0112_248] not matched on Jav321
DEBUG: [0112_248] [Get-JVData] [Search - Jav321] [Url - ]                                                                                                                                                  DEBUG: [0112_248] [Get-JVData] [Waiting - Scraper jobs] [jvdata-Javbus jvdata-Jav321]
DEBUG: [0112_248] [Get-JVData] [Completed - Scraper jobs] [jvdata-Javbus jvdata-Jav321]                                                                                                                    DEBUG: [0112_248] [Get-JVData] [Success - Scraper jobs] []
DEBUG: [0112_248] [Get-JVData] [Removed - Scraper jobs]                                                                                                                                                    WARNING: [010112_248-1pon-whole1_hd.avi] Skipped -- not matched

Steps to Reproduce (for bugs)

See attached settings files

Using regex=(\d+_\d+)|(\d+-\d+)

Your Environment

jvlflame commented 4 years ago

Thanks for the detailed writeup.

I was able to diagnose where the ID transformation was occurring and it will be fixed in the next release.